0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

14341 Commits

Author SHA1 Message Date
Mark Otto
c8bd62b214 clarify, fix margin 2016-02-08 22:13:30 -08:00
Chris Rebert
145fa2ff99 Merge pull request #19135 from twbs/revert-19119-wkbug-138201-fixed
Add https://webkit.org/b/138201 back to the Wall of Browser Bugs
2016-02-08 20:14:31 -08:00
Chris Rebert
df07536dd1 Revert "https://webkit.org/b/138201 no longer repros" 2016-02-08 20:10:10 -08:00
Chris Rebert
b7f70102eb Merge pull request #19128 from twbs/flex-utils
Flex utility classes shouldn't depend on $enable-grid-classes
2016-02-08 13:04:09 -08:00
Chris Rebert
b6b063812b Merge pull request #19126 from twbs/native-font-stack-docs
Fixes+tweaks to native font stack docs
2016-02-08 12:59:25 -08:00
Chris Rebert
950706dbf9 Merge pull request #19125 from twbs/division
_forms.scss: Use division instead of fractional multiplication
2016-02-08 12:54:11 -08:00
Chris Rebert
472e0e1259 Flex utility classes shouldn't depend on $enable-grid-classes
[skip sauce]
[skip validator]
2016-02-08 04:25:45 -08:00
Chris Rebert
3c8e08e307 Grid docs: Remove !default from SCSS snippets
Fixup for fb4f5f0bf1
[skip sauce]
2016-02-08 04:01:58 -08:00
Chris Rebert
74002ce92d Migration docs: Mention $grid-breakpoints and $container-max-widths by name
[skip sauce]
2016-02-08 03:57:41 -08:00
Chris Rebert
9248602ecf Fixes+tweaks to native font stack docs
[skip sauce]
2016-02-08 03:53:59 -08:00
Chris Rebert
8141835682 _forms.scss: Use division instead of fractional multiplication
[skip sauce]
[skip validator]
2016-02-08 03:34:24 -08:00
Chris Rebert
8ffcb5f055 _forms.scss: Remove extra trailing 0 in fractional number
[skip sauce]
[skip validator]
2016-02-08 03:31:54 -08:00
Chris Rebert
1d14d5c404 Fix apparent typo in b8ff763d62
[ci skip]
2016-02-08 03:05:03 -08:00
Chris Rebert
72f10dd7e6 Only caption 1st set of progress bar examples 2016-02-08 00:39:33 -08:00
Mark Otto
ba4d52ef29 grunt 2016-02-07 23:49:09 -08:00
Mark Otto
9c3ba540b4 add example of multiple add-ons to docs 2016-02-07 23:48:47 -08:00
Mark Otto
23d47122ef Merge branch 'multiple-input-group-addon' of https://github.com/vicary/bootstrap into vicary-multiple-input-group-addon 2016-02-07 23:41:35 -08:00
Mark Otto
48df6e3b72 grunt 2016-02-07 23:38:03 -08:00
Mark Otto
e8b6e5fc69 Merge pull request #19121 from twbs/v4-form-sizing
v4: Updated form and button sizing
2016-02-07 23:35:45 -08:00
Mark Otto
e455b6b8d2 Merge branch 'v4-dev' into v4-form-sizing 2016-02-07 22:48:26 -08:00
Mark Otto
e589cdbfe9 Put that new var to use to match form group addons to form controls 2016-02-07 22:47:04 -08:00
Mark Otto
38c93371c1 updated button/form-control padding and line-height
- Moves from no set line-height (inherited of 1.5) to declared 1.25 for
all inputs and buttons (regardless of size modifier).

- Updates padding to be `.5rem` instead of `.375rem` so that padding is
more likely to be whole numbers based on the root font-size.

- Whole numbers will be beneficial in avoiding odd fractional pixels
that can lead to misalignment as shown in #18607.

- Large buttons and inputs are now a tad wider, and smaller
buttons/inputs a tad shorter and narrower, too.
2016-02-07 22:46:50 -08:00
Mark Otto
a16b2ef162 Remove line-height from the button size mixin too 2016-02-07 22:43:53 -08:00
Mark Otto
ab451e5dc0 Remove commented out height on large/small inputs 2016-02-07 22:43:24 -08:00
Mark Otto
8fcdbd38f8 Remove specific line-heights from large/small inputs as well 2016-02-07 22:43:10 -08:00
Mark Otto
1db8dc10b5 Remove line-height from button mixin calls 2016-02-07 22:39:49 -08:00
Chris Rebert
e3b55aadea grunt dist docs 2016-02-07 21:17:05 -08:00
Chris Rebert
da848536ce _forms.scss: Remove extra url()s in commented-out code
[skip sauce]
[skip validator]
2016-02-07 20:20:14 -08:00
Chris Rebert
44eedd2115 docs/components/forms.md: Fix typo: non => none
Fixup for 365db6e3a8
/fyi @mdo
[skip sauce]
2016-02-07 17:50:38 -08:00
Chris Rebert
635a72df23 Merge pull request #19119 from twbs/wkbug-138201-fixed
https://webkit.org/b/138201 no longer repros
2016-02-07 17:03:33 -08:00
Chris Rebert
f618aa7c01 https://webkit.org/b/138201 no longer repros
Wasn't able to reproduce in iOS 9.2.
So remove its entry from the Wall of Browser Bugs.
Refs #14708
[skip sauce]
2016-02-07 16:52:14 -08:00
Chris Rebert
7cbbc6a074 Merge pull request #19112 from twbs/m-x-auto-doc-centering
Docs: Add "Horizontal centering" subheading for .m-x-auto
2016-02-07 13:18:59 -08:00
Chris Rebert
5142ac2389 Docs: Add captions above progress bars; refs #17264
[skip sauce]
2016-02-07 13:13:07 -08:00
Chris Rebert
1dc6e4c9e5 Merge pull request #19115 from vsn4ik/v4-dev-fix-css3-not-selector
Fix css3 :not selector
2016-02-07 11:51:39 -08:00
Chris Rebert
f30876c8bc Merge pull request #19111 from twbs/fix-18549
Assert that $grid-breakpoints and $container-max-widths are in ascending order
2016-02-07 11:47:29 -08:00
vsn4ik
e7b0ccff63 Fix CSS3 :not() selector 2016-02-07 19:21:26 +03:00
Chris Rebert
0fe396211d Fix bad localhost link in Typography docs
Fixup for 27ba4beb22
/fyi @mdo
[skip sauce]
2016-02-07 03:04:33 -08:00
Chris Rebert
8dfd30cc21 Docs: Add "Horizontal centering" subheading for .m-x-auto
Refs #19102
[skip sauce]
2016-02-07 03:00:59 -08:00
Chris Rebert
35617a4b22 Assert that $grid-breakpoints and $container-max-widths are in ascending order; fixes #18549
[skip sauce]
2016-02-07 02:53:37 -08:00
Chris Rebert
6dee16ca90 Merge pull request #19108 from twbs/shrinkwrap
Update npm shrinkwrap
2016-02-07 00:50:27 -08:00
Chris Rebert
b73f2c3830 update shrinkwrap for f25f9bceb1 2016-02-07 00:44:52 -08:00
Chris Rebert
41977db43a Reboot: Update @viewport comment to account for de944e088b
[ci skip]
2016-02-07 00:28:23 -08:00
Chris Rebert
ea48391e77 Merge pull request #19106 from twbs/fix-19101
Add $enable-print-styles variable for _print.scss
2016-02-06 21:40:49 -08:00
Chris Rebert
ecdfc71d1f Add $enable-print-styles variable for _print.scss; fixes #19101
[skip sauce]
2016-02-06 21:35:19 -08:00
Chris Rebert
3bd8dee1c7 docs/components/modal.md: Fix typo
Fixup for #19105
[ci skip]
2016-02-06 21:29:30 -08:00
Mark Otto
612d287a07 Fixes #18550: really remove that reference 2016-02-06 20:46:11 -08:00
Mark Otto
cb7b780876 grunt 2016-02-06 20:32:24 -08:00
Mark Otto
cecc3017dc Merge pull request #19105 from twbs/v4-modal-widths
v4: Update modal sizing
2016-02-06 20:31:27 -08:00
Mark Otto
64b88bd707 remove comment 2016-02-06 20:28:36 -08:00
Mark Otto
6c2b0d2b76 Updat modal sizing
- Switch from width to max-width for all widths to avoid scaling outside viewport bounds
- Rejigger the media queries for a more logical breakpoint for the large and small modal sizes
- Avoids changing the width of the default modal (nullifying #17794 and fixing #17581)
2016-02-06 20:18:48 -08:00