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

266 Commits

Author SHA1 Message Date
Chris Rebert
3003f530c9 Extract $carousel-icon-width variable
[skip sauce]
[skip validator]
2016-02-16 20:46:52 -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
d7d0e186bd Merge branch 'v4-dev' into v4-split-buttons 2016-02-06 20:33:26 -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
Chris Rebert
a5b41e7254 Extract $btn-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
6293dd41cf Extract $kbd-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
7be17b4a35 Merge pull request #18821 from twbs/popover-vars
Add variables for padding of popover title & content
2016-01-16 14:08:14 -08:00
Chris Rebert
dda263d9ac Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
2016-01-16 14:07:49 -08:00
Chris Rebert
a22c696485 Extract $blockquote-border-width variable
[skip sauce]
2016-01-14 22:27:08 -08:00
Chris Rebert
27a7fff0fb Use proper variable for .dropdown-backdrop's z-index 2016-01-13 16:21:52 -08:00
Chris Rebert
a4745dd7a1 Use proper units when adding/subtracting lengths
[skip sauce]
[skip validator]
2016-01-13 16:16:43 -08:00
Chris Rebert
ed3551415c Extract $btn-active-box-shadow variable & refactor accordingly
[skip sauce]
[skip validator]
2016-01-09 15:14:36 -08:00
Chris Rebert
46c9f4b143 Add $progress-box-shadow variable
[skip sauce]
[skip validator]
2016-01-09 14:59:08 -08:00
Chris Rebert
c919746a4f Add variables for padding of popover title & content
[skip sauce]
[skip validator]
2016-01-09 14:46:04 -08:00
Chris Rebert
4a667f5bb7 Add variables for media object margins and padding
[skip sauce]
[skip validator]
2016-01-09 14:34:59 -08:00
Chris Rebert
f646ed7920 Merge pull request #18466 from twbs/tooltip-padding-vars
Introduce $tooltip-padding & $tooltip-padding-x vars
2016-01-09 14:28:12 -08:00
Mark Otto
cf7795da93 Add liberation Mono to the font stack for the Linux peeps
Fixes #18609

[skip sauce]
[skip validator]
2016-01-08 23:31:30 -08:00
Mark Otto
f6ad665c26 Switch up some split button stuff
- New vars
- New function for stripping units so we can combine rems and ems in math functions
- Add new classes for sizing and spacing around the split dropdown toggle so that the caret isn't misaligned
2016-01-08 13:23:24 -08:00
Mark Otto
643bd8eaeb Merge pull request #18787 from twbs/btn-vars
Add variables for spacing of .btn-toolbar and split-button dropdown toggles
2016-01-07 00:47:40 -08:00
Mark Otto
7fdd521459 more variables spacing 2016-01-07 00:21:58 -08:00
Mark Otto
de027e637f pointless comments 2016-01-07 00:20:36 -08:00
Mark Otto
b39b8b631b more variables spacing 2016-01-07 00:20:25 -08:00
Mark Otto
ea9967c535 spacing 2016-01-07 00:19:48 -08:00
Chris Rebert
fb71efaeb2 Add variables for spacing of .btn-toolbar and split-button dropdown toggles
[skip sauce]
2016-01-06 16:42:21 -08:00
Mark Otto
fac0c31a27 New $nav-pills-active-link-* variables
- Renames old and unused $nav-pills-active-link-hover-* for
$nav-pills-active-link-* ones
- Puts those vars to use in place of defaults $component-* vars on nav
pills
2016-01-06 15:50:08 -08:00
Mark Otto
774a2ed37e Spacing y'all 2016-01-06 15:47:28 -08:00
Mark Otto
7da2e12852 Regroup nav variables 2016-01-06 15:46:48 -08:00
Mark Otto
93dda63b39 Revamp tabbed nav border variables
- Add new $nav-tabs-border-width for the bottom border on the .nav-tabs
parent class
- Use that new variable for the negative margin on nav-items within it
for consistent customization
- Drop the $nav-tabs-link-border-width for the new variable so it’s all
tied together
2016-01-06 15:45:26 -08:00
Mark Otto
7668a66bbe Add $nav-disabled-link-hover-bg variable 2016-01-06 15:42:32 -08:00
Mark Otto
030ab626a5 Add $nav-item-inline-spacer variable
So folks can customize the distance between nav links in inline navs.
2016-01-06 15:41:35 -08:00
Mark Otto
fe40de1816 follow up to #18782: remove pager vars 2016-01-06 15:00:28 -08:00
Chris Rebert
c3d1b7f256 Introduce $tooltip-padding-{x,y} & $tooltip-margin vars
[skip sauce]
2016-01-06 14:56:16 -08:00
Mark Otto
11df78ec74 Revamp custom form styles
- Less nesting with more specific classes
- New class names for most elements to avoid unnecessary and potentially confusing shorthand
- Require new class and markup for the description (though it's only necessary for disable states, it's now part of the entire component's markup for all states just in case)
- Change up colors and variables for regular and disabled states
2016-01-05 23:25:42 -08:00
markau
871a003ca2 Fixes #17918: Add styles for disabled custom checkboxes and radios 2016-01-05 00:47:32 -08:00
Chris Rebert
edbdf21de5 Merge pull request #18464 from twbs/btn-block-spacing-y
Introduce $btn-block-spacing-y variable
2015-12-23 23:44:50 -07:00
Chris Rebert
76a4c303ee Refactor Breadcrumbs component
Use new `.breadcrumb-item` class instead of child selectors and `li` tag selectors,
so as to no longer require the usage of `<ol>`-based markup.

Rename variables to follow naming conventions:
* $breadcrumb-padding-vertical => $breadcrumb-padding-y
* $breadcrumb-padding-horizontal => $breadcrumb-padding-x

Introduce new variable: $breadcrumb-item-padding

[skip sauce]
2015-12-23 22:16:35 -07:00
Chris Rebert
c6a276dd74 Set $progress-bg to color we are actually using 2015-12-21 10:57:57 -07:00
Chris Rebert
5a18638f26 Set $progress-bar-color to color we are currently using 2015-12-21 10:57:54 -07:00
Chris Rebert
e6fdebb9c7 Merge pull request #18463 from twbs/nav-item-margin
Introduce $nav-item-margin variable
/fyi @mdo
2015-12-16 22:17:09 -08:00
Chris Rebert
92338da1f3 Merge pull request #18469 from twbs/card-deck-margin
Introduce $card-deck-margin variable
/fyi @mdo; happy to tweak the var names if desired
2015-12-16 22:16:36 -08:00
Chris Rebert
34fe668af2 Merge pull request #18472 from twbs/x-y-vars
Rename 2 navbar variables to comply with updated naming convention
2015-12-12 00:32:28 -08:00
Alexandr Kondrashov
c4c9e1959f Fix size of validation feedback icons 2015-12-08 14:54:37 +03:00
Chris Rebert
1861b05b5f Rename 2 navbar variables to comply with updated naming convention
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
2015-12-08 01:30:23 -08:00
Chris Rebert
0330d4acc2 Introduce $btn-block-spacing-y variable
[skip sauce]
2015-12-08 01:14:09 -08:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable
[skip sauce]
[skip validator]
2015-12-08 01:13:37 -08:00
Chris Rebert
de9ad37c5d Introduce $nav-item-margin variable
[skip sauce]
2015-12-08 01:12:57 -08:00
Chris Rebert
5871be0ce6 Refactor _utilities-spacing.scss; fixes #18129 2015-12-08 01:08:03 -08:00
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
2015-12-07 20:41:51 -08:00
Alexandr Kondrashov
750d45c9e9 Add an empty line at the end of the file 2015-12-08 03:46:16 +03:00
Alexandr Kondrashov
d4e9dad3de SVG: base64 > ASCII85 (fix merge) 2015-12-08 03:27:53 +03:00
Alexandr Kondrashov
568073feb9 SVG: base64 > ASCII85 2015-12-08 02:48:05 +03:00