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

214 Commits

Author SHA1 Message Date
Chris Rebert
9f85c6e1d1 Extract $carousel-control-sm-up-size variable
[skip sauce]
[skip validator]
2016-02-16 20:50:48 -08:00
Mark Otto
d6207d852a Merge branch 'fix-19094' of https://github.com/ameya-pandilwar/bootstrap into ameya-pandilwar-fix-19094 2016-02-16 20:28:51 -08:00
Mark Otto
e194db05c8 Merge branch 'v4-dev' into mark-padding 2016-02-16 20:25:40 -08:00
Mark Otto
853921df32 Merge pull request #19210 from twbs/small-font-size
Add $small-font-size variable
2016-02-16 20:23:54 -08:00
Mark Otto
6636e979d9 Merge pull request #19211 from twbs/mark-bg-var
Add $mark-bg so <mark>'s background-color can be customized independently of $state-warning-bg
2016-02-16 20:23:41 -08:00
Mark Otto
57a310c3d3 Merge pull request #19214 from twbs/label-font-size
Add $label-font-size variable in the name of not hardcoding values
2016-02-16 20:23:22 -08:00
Mark Otto
ca77f52875 Merge pull request #19215 from twbs/label-pill-border-radius
Add $label-pill-border-radius variable
2016-02-16 20:23:03 -08:00
Mark Otto
60f83096f1 Merge pull request #19218 from twbs/breakpoint-vars-are-minimums
Clarify that $grid-breakpoints are minimum widths for each breakpoint
2016-02-16 20:22:43 -08:00
Chris Rebert
ea1fa05285 Change comment to clarify that $grid-breakpoints are minimum widths for each breakpoint
(as opposed to maximums)

[ci skip]
2016-02-16 01:24:34 -08:00
Chris Rebert
cdc0a7a748 Introduce $mark-bg variable so that <mark>'s background-color can be customized independently of $state-warning-bg
[skip sauce]
[skip validator]
2016-02-16 00:44:55 -08:00
Chris Rebert
4c6946b3a9 Extract $dropdown-min-width variable
[skip sauce]
[skip validator]
2016-02-16 00:42:10 -08:00
Chris Rebert
08d23959ac Add $label-pill-border-radius variable
[skip sauce]
[skip validator]
2016-02-16 00:37:45 -08:00
Chris Rebert
2c034cf542 Add $label-font-size variable in the name of not hardcoding values
[skip sauce]
[skip validator]
2016-02-16 00:27:53 -08:00
Chris Rebert
c80cf45960 Extract $label-pill-padding-x variable
[skip sauce]
[skip validator]
2016-02-16 00:25:18 -08:00
Chris Rebert
1d634a07ce Extract $label-padding-{x,y} variables
[skip sauce]
[skip validator]
2016-02-16 00:18:30 -08:00
Chris Rebert
4278eb57ab Add $small-font-size variable
[skip sauce]
[skip validator]
2016-02-15 23:59:53 -08:00
Chris Rebert
7441beba67 Add $mark-padding variable
[skip sauce]
[skip validator]
2016-02-15 23:55:20 -08:00
Chris Rebert
ef89acb974 Extract $modal-content-border-width variable
[skip sauce]
[skip validator]
2016-02-15 23:45:28 -08:00
Chris Rebert
ece0775bee Extract $modal-{header,footer}-border-width variables
[skip sauce]
[skip validator]
2016-02-15 23:35:57 -08:00
Chris Rebert
e1be284d0c Extract $modal-dialog-sm-up-margin-y variable
[skip sauce]
[skip validator]
2016-02-15 23:24:41 -08:00
Chris Rebert
b35aa23453 Extract new $modal-dialog-margin variable
[skip sauce]
[skip validator]
2016-02-15 23:10:38 -08:00
Ameya Pandilwar
4ed5fa77ff Rename .label class to .tag 2016-02-11 03:54:30 -05: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
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
e455b6b8d2 Merge branch 'v4-dev' into v4-form-sizing 2016-02-07 22:48:26 -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
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
ecdfc71d1f Add $enable-print-styles variable for _print.scss; fixes #19101
[skip sauce]
2016-02-06 21:35:19 -08:00
Mark Otto
9ca44d29f5 Follow up to #19099: Correct grid gutter value 2016-02-06 20:12:55 -08:00
Mark Otto
11606d391e update to latest from @thekondrashov's jsfiddle 2016-02-06 18:05:07 -08:00
Mark Otto
198e34a096 Merge branch 'patch-1' of https://github.com/thekondrashov/bootstrap into thekondrashov-patch-1 2016-02-06 17:00:57 -08:00
Mark Otto
fffaaed0fd Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 15:09:32 -08:00
Mark Otto
9c69f6f5c5 Merge branch 'v4-dev' into v4-font-stack 2016-02-06 15:01:44 -08:00
Mark Otto
cd3af1fa1a Update to drop Open Sans, add Fira and Droid Sans 2016-02-06 13:23:00 -08:00
Mark Otto
414ae3aa1a use px in grid col padding since we're using px everywhere else for them 2016-02-06 13:01:52 -08:00
Mark Otto
d5e474b4ab linter 2016-02-06 12:29:53 -08:00
Mark Otto
73e5e89e0e Switch to native font stack 2016-02-05 23:01:59 -08:00
Mark Otto
b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Mark Otto
e672c15b6d Merge pull request #19002 from twbs/blockquote-border-width
Add $blockquote-border-width variable
2016-01-23 20:42:23 -08:00
Chris Rebert
8b67d4c762 Make translation of custom file input text easier; fixes #18922
[skip sauce]
2016-01-17 20:53:11 -08:00
Mark Otto
955e0405ea fuck around with card borders and more 2016-01-17 18:55:24 -08:00
Mark Otto
776337924e Merge pull request #18920 from twbs/v4-custom-forms-vars
v4: Custom forms variables
2016-01-17 17:54:45 -08:00
Mark Otto
3a2f0456bf Merge pull request #18883 from twbs/zindex-dropdown-backdrop
Use proper variable for .dropdown-backdrop's z-index
2016-01-17 15:25:58 -08:00
Mark Otto
5c12d5e469 add custom file vars, fix up custom select var 2016-01-17 15:21:16 -08:00
Mark Otto
6b318ef176 Hella vars for custom checkboxes and radios and selects 2016-01-16 22:29:51 -08:00
Chris Rebert
802c1cb5fc Extract variables for .modal-content box-shadow
[skip sauce]
[skip validator]
2016-01-16 20:25:00 -08:00
Chris Rebert
bbd449994a Extract $thumbnail-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
9b2d9f6e04 Extract $popover-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
58f7e602ae Extract $dropdown-box-shadow variable 2016-01-16 20:23:37 -08:00