0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

14158 Commits

Author SHA1 Message Date
Chris Rebert
b35aa23453 Extract new $modal-dialog-margin variable
[skip sauce]
[skip validator]
2016-02-15 23:10:38 -08:00
Chris Rebert
48e02ebb8a Merge pull request #19156 from twbs/rm-bugzilla-1060131
Remove http://bugzil.la/1060131 from Wall of Browser Bugs
2016-02-10 19:59:12 -08:00
Chris Rebert
a24112e850 Remove http://bugzil.la/1060131 from Wall of Browser Bugs
http://bugzil.la/1060131 has been fixed by http://bugzil.la/823483 which should land in Firefox 46.
Refs #14320
[ci skip]
2016-02-10 19:58:30 -08:00
Chris Rebert
119269445a Merge pull request #19155 from twbs/rm-bugzilla-975632
Remove http://bugzil.la/975632 from Wall of Browser Bugs
2016-02-10 19:49:51 -08:00
Chris Rebert
183b57b504 Remove http://bugzil.la/975632 from Wall of Browser Bugs
http://bugzil.la/975632 has been fixed by http://bugzil.la/823483 which should land in Firefox 46.
Refs #10690
[ci skip]
2016-02-10 19:49:21 -08:00
Chris Rebert
a1bf344c4f Merge pull request #18925 from twbs/fixes-18922
Make translation of custom file input text easier
2016-02-09 01:38:14 -08:00
Mark Otto
a263e19419 grunt 2016-02-08 23:43:43 -08:00
Mark Otto
33d7ed77c8 linting follow up to #19140 2016-02-08 23:43:37 -08:00
Mark Otto
8c991939ab Merge pull request #19136 from twbs/v4-input-border
v4: Translucent .form-control borders
2016-02-08 23:41:48 -08:00
Mark Otto
cb77f68868 Merge pull request #19140 from twbs/v4-card-list-group-corners
v4: Avoid shorthand border-radius for list groups in cards
2016-02-08 23:41:16 -08:00
Mark Otto
3b00f9ffc9 Merge pull request #19137 from twbs/v4-modal-footer-btns
v4: Simpler modal footer buttons
2016-02-08 23:38:59 -08:00
Mark Otto
faa7cea301 fixes #18940: use specific border properties when changing the corners of list groups in cards to avoid overriding combo first-/last-child items 2016-02-08 23:37:38 -08:00
Mark Otto
45da517428 Merge branch 'v4-dev' into v4-input-border 2016-02-08 23:32:19 -08:00
Mark Otto
74a516a9b1 Merge branch 'v4-dev' into v4-modal-footer-btns 2016-02-08 23:32:12 -08:00
Chris Rebert
6370e9dc75 Merge pull request #19138 from twbs/update-gemfile
bundle update
2016-02-08 23:29:10 -08:00
Mark Otto
e117166e82 Merge branch 'v4-dev' into v4-input-border 2016-02-08 23:27:52 -08:00
Chris Rebert
8455eb3ba8 bundle update 2016-02-08 23:20:21 -08:00
Mark Otto
4b97596982 Fixes #18949: Remove extra margin overrides for buttons in .modal-footer 2016-02-08 22:34:38 -08:00
Mark Otto
a40d94000f grunt 2016-02-08 22:32:59 -08:00
Mark Otto
c3e4cbdfb0 Move to a translucent input border with background-clip: padding-box for improved blending across different background-colors 2016-02-08 22:28:11 -08:00
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
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