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

816 Commits

Author SHA1 Message Date
Mark Otto
447fc28f8d linting grid css 2016-02-06 14:54:13 -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
3743f279c1 linting 2016-02-06 12:32:43 -08:00
Mark Otto
8d46a95071 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 12:30:03 -08:00
Mark Otto
d5e474b4ab linter 2016-02-06 12:29:53 -08:00
Mark Otto
f127bc68a3 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 12:29:06 -08:00
Mark Otto
03ec195974 linter overhaul 2016-02-06 12:28:18 -08:00
Mark Otto
15018a6d8a Ugh, Sass doesn't do extends across media, so we can't use placeholder here 2016-02-06 11:48:28 -08:00
Mark Otto
50e854affa property order and white space 2016-02-06 11:36:45 -08:00
Mark Otto
4ab7c93bcc property order 2016-02-06 11:33:31 -08:00
Mark Otto
95f34be093 More grid updates
- Flexbox responsive behavior fixed with specific .col-{breakpoint} classes now added
- Dropped the make-col mixin in favor of a column-basics placeholder that we can extend across our grid infrastructure
- Updated docs to use required .col-xs-12 (as a safeguard for when folks enable flexbox mode--this isn't necessary in default grid mode)
- Update flexbox grid docs to include responsive docs, tweak some other bits too
2016-02-06 11:31:46 -08:00
Mark Otto
414997baa8 flip things around again, no more base class, try out some new stuff to keep responsive flex grid working 2016-02-06 10:51:59 -08:00
Mark Otto
9e3214051d add horizontal flex utils 2016-02-06 01:47:04 -08:00
Mark Otto
5e41887c3c rename vertical align flex utils to middle to avoid clash with horizontal center 2016-02-06 01:46:42 -08:00
Mark Otto
82b98e72a4 more accurate comments 2016-02-06 01:46:14 -08:00
Mark Otto
7b7cf221cd Move the conditional statement back to the file because nested imports aren't supported in Sass 2016-02-06 01:29:51 -08:00
Mark Otto
0de7321bbb rename .flex-all-* to .flex-items-* to match flexbox nomenclature 2016-02-06 00:59:43 -08:00
Mark Otto
044716ed4a Conditionally include the flex utils in the import stack and reduce to a single query 2016-02-06 00:58:19 -08:00
Mark Otto
f50dedaaaf Move grid flex classes to utils instead maybe? 2016-02-06 00:52:53 -08:00
Mark Otto
cac92017d3 Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 00:47:40 -08:00
Mark Otto
5a9538d4c7 Revamp grid classes to require .col base class and improve flexbox grid classes with auto layout via flex: 1 2016-02-06 00:45:29 -08:00
Mark Otto
263e06a021 rearrange scss lint config to put flex over float 2016-02-06 00:20:24 -08:00
Mark Otto
73e5e89e0e Switch to native font stack 2016-02-05 23:01:59 -08:00
Chris Rebert
23979a9994 Revert separation of <hN> and .hN heading styles
This reverts commit deeb74e321.

Reverts #18038
Fixes #18992
[skip sauce]
[skip validator]
2016-02-04 00:05:02 -08:00
Mark Otto
b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -08:00
Mark Otto
b75a0ca979 fuck that other class, let's just get tabs and pills in there 2016-02-03 20:52:33 -08:00
Mark Otto
b4a2b99395 Dump the type margin overrides in alerts for utils, document that particular example, sidesteps part of #18884 2016-02-03 20:43:12 -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
XhmikosR
e672d60646 Update print styles to v5.3.0 of html5 boilerplate. 2016-01-26 21:37:44 +02:00
mkroeders
a62f70b420 Allow a <label> for .input-group-addon by zeroing out margin-bottom
When using a <label> as an .input-group-addon, there will be a default margin-bottom of .5rem via Reboot.
This will lead to undesirable whitespace below the label and the <input> will become taller than needed. By removing the margin, it will play nice with <label> elements.

Closes #19012
2016-01-23 22:18:43 -08:00
Chris Rebert
d54d9d3f7a Merge pull request #19001 from twbs/bump-normalize
Bump Normalize so we can remove Reboot's input[type=search] box-sizing override
2016-01-23 22:11:27 -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
Mark Otto
fa0e68e486 Merge pull request #19000 from twbs/print-img-max-width-100-hell
Remove print-specific img max-width:100%; style so that Google Maps etc. print correctly
2016-01-23 20:37:36 -08:00
Mark Otto
2fe6c6c88b Merge pull request #18927 from twbs/fix-16871
Apply word-wrap:break-word to Tooltips and Popovers
2016-01-23 20:36:59 -08:00
Chris Rebert
7e2e31e964 scss/_forms.scss: Remove now-unnecessary SCSS-Lint exemption
[skip sauce]
2016-01-23 03:06:21 -08:00
Chris Rebert
739b51f264 Reboot: Remove now-unnecessary input[type="search"] box-sizing override
Revert "fixes #17379: override search input box-sizing to match our global overrides"

This reverts commits 468a9d9359 & 57998dc274.

https://github.com/necolas/normalize.css/pull/496 has made this override unnecessary.

[skip sauce]
2016-01-21 14:50:06 -08:00
Chris Rebert
beeafc2808 Bump Normalize to fe567632af
So as to pull in https://github.com/necolas/normalize.css/pull/496
2016-01-21 14:28:41 -08:00
Chris Rebert
8820c563d2 Remove print-specific img max-width:100%; style so that Google Maps and other widgets print correctly
See https://github.com/h5bp/html5-boilerplate/issues/1741
X-Ref: #1506
2016-01-21 14:18:54 -08:00
Patrick H. Lauke
200860334d Add pointer-events:none to custom indicator
Closes #18887
2016-01-19 01:34:47 +00:00
Chris Rebert
032adf1324 Apply word-wrap:break-word to Tooltips and Popovers
Fixes #16871 for v4
2016-01-17 22:23:29 -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
Chris Rebert
beb9fc2895 Merge pull request #18880 from twbs/gradient-x-y
Rename gradient mixins to match new naming convention
2016-01-17 19:34:10 -08:00
Mark Otto
26f10db70e Merge pull request #18848 from twbs/rounded-progress
Respect $border-rounded inside progress bars too
2016-01-17 19:04:29 -08:00
Mark Otto
11efaf5439 Merge pull request #18878 from twbs/btn-group-vertical
rm unnecessary border-radius properties from .btn-group-vertical code
2016-01-17 19:00:37 -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
dd4062f213 Update docs to include mention of the custom variables file 2016-01-17 16:04:18 -08:00
Mark Otto
567a0e9cee add custom overrides to other bundles 2016-01-17 15:54:17 -08:00
Mark Otto
d00eef1dac Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap into stephaniepurvis-provide-custom-scss 2016-01-17 15:51:49 -08:00
Mark Otto
2f4af5c295 condense that comment, clean up formatting 2016-01-17 15:50:27 -08:00
Mark Otto
8a0b8b6b03 Merge pull request #18789 from twbs/fix-18733-more
Prevent breadcrumb separator from getting underlined on hover when not using <ol> markup
2016-01-17 15:45:02 -08:00
Mark Otto
c0a8a70d59 Missing ; 2016-01-17 15:32:01 -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 Purssell
0762a1978c Allow custom breakpoint config to be passed on by mixins which nest media query mixins. 2016-01-14 16:33:04 +10: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
44a1361079 Rename gradient mixins to match new naming convention
gradient-{horizontal=>x}[-three-colors]
gradient-{vertical=>y}[-three-colors]
2016-01-13 15:34:01 -08:00
Chris Rebert
d26b7c7a2c Rename local vars per new naming convention: $padding-{vertical=>y} $padding-{horizontal=>x}
[skip sauce]
[skip validator]
2016-01-13 15:29:06 -08:00
Chris Rebert
3daf4275eb rm unnecessary border-radius properties from .btn-group-vertical code
[skip sauce]
[skip validator]
2016-01-13 15:05:23 -08:00
Chris Rebert
1e37f507d5 Respect $border-rounded inside progress bars too
[skip sauce]
2016-01-11 12:29:50 -08:00
Anders Sahlin
ea4a79c689 Modals respect $enable-rounded setting
See issue: https://github.com/twbs/bootstrap/issues/18385
2016-01-11 14:02:14 +01:00
Chris Rebert
cbc71dc229 Merge pull request #18816 from twbs/fix-17308
Switch to actually-Safari-specific CSS hack for iOS temporal input fix
2016-01-10 18:38:26 -08:00
Chris Rebert
350ce2f707 Switch to actually-Safari-specific CSS hack when fixing vertical alignment of temporal input text in iOS Safari
See http://browserbu.gs/css-hacks/webkit-full-page-media/
Fixes #17308

[skip sauce]
[skip validator]
2016-01-10 18:22:10 -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
Chris Rebert
8adc9d771f Remove remaining reference to <input type="datetime"> in SCSS comment
Erratum of #18778

[skip sauce]
[skip validator]
2016-01-08 23:55:23 -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
3740d8f2ac Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-01-07 11:52:20 -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
Chris Rebert
86caa76f54 In IE9-11, prevent breadcrumb separator from getting underlined on :hover when not using <ol> markup
Fixes #18733 in IE9-11
Also adds comments to the code explaining this and #18740.
2016-01-07 00:43:35 -08:00
Bass Jobsen
53958dab0b In modern browsers, prevent breadcrumb separator from getting underlined on :hover when not using <ol> markup
Fixes #18733, except in IE9-11
Closes #18740
2016-01-07 00:43:28 -08:00
Mark Otto
1429a0d8a9 fix input group addon alignment 2016-01-07 00:38:41 -08:00
Mark Otto
dfae3d46e4 Add a comment to follow-up on #17756 2016-01-07 00:30:49 -08:00
Mark Otto
af13a97d51 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-01-07 00:29:34 -08:00
Mark Otto
2502f84dde Merge pull request #17756 from zalog/patch-11
Flexbox grid column wrapping bug
2016-01-07 00:29:23 -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
Mark Otto
ea5fdc5b5f Fixes #18681: Use a local varible to calculate a unit-less border offset for the popover title 2016-01-07 00:16:59 -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
c847279e14 Consolidate nav-tab dropdown styles with nav-tab styles
- Moves styles up the document a bit to nest them
- Drops the static 1px for $navbar-tabs-border-width so once again it’s
all tied together should folks customize that
2016-01-06 15:51:23 -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
Mark Otto
095dd9ffb0 Merge pull request #18782 from twbs/v4-rip-pager
v4: Drop pager component
2016-01-06 14:57:51 -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
d5b2dea1a5 Rip out the pager component 2016-01-06 14:47:33 -08:00
Chris Rebert
f547806e88 Remove associated comment too
Erratum from #18658
[ci skip]
2016-01-06 14:42:37 -08:00
Mark Otto
d46c7ef565 fixes #18658: no more min-width action on progress bars. we had them in v3 and ended up removing them for additional problems it caused folks. 2016-01-06 14:33:58 -08:00
Patrick H. Lauke
3da46631e7 Merge pull request #18775 from twbs/hack-18543
Set -ms-overflow-style:scrollbar to workaround apparent IE11+Edge @viewport bug
2016-01-06 20:15:58 +00:00
vsn4ik
e543565d78 Use text-emphasis-variant mixin for .text-muted 2016-01-06 16:47:44 +03:00
Chris Rebert
0c9429a803 Set -ms-overflow-style:scrollbar to workaround apparent IE11+Edge @viewport bug
Closes #18543
2016-01-06 01:21:01 -08:00
Mark Otto
b48eb53962 rename .card-*-outline to .card-outline-* for consistency with button outlines 2016-01-06 01:09:45 -08:00
Mark Otto
6d01de2f74 Merge pull request #18518 from sergej2705/v4-dev-background-variant
Added !important to hover
2016-01-06 01:07:28 -08:00
Mark Otto
3dd08d60eb Merge pull request #18695 from bassjobsen/patch-30
.container, .container-fluid should be conditional upon $enable-grid-…
2016-01-06 01:00:22 -08:00
Mark Otto
0be0a8eb1a fixes #17719: rename .btn-*-outline to .btn-outline-* 2016-01-06 00:11:49 -08:00
Mark Otto
ff07ba3af4 Merge pull request #18771 from twbs/v4-custom-forms-revamp
v4: Custom forms (disabled state, revamp, etc)
2016-01-06 00:02:25 -08:00
Mark Otto
4625547aea disable it for the whole file 2016-01-06 00:00:08 -08:00
Mark Otto
069277e86f really disable the offending one 2016-01-05 23:58:34 -08:00
Mark Otto
00e2b29041 try disabling that 2016-01-05 23:56:08 -08:00
Mark Otto
d8d67eaa6a rewrite custom file input component to use classes over nested elements 2016-01-05 23:45:44 -08:00
Mark Otto
ac446058ff ensure custom selects get rounded corners 2016-01-05 23:45:20 -08:00
Mark Otto
8d66b9956c Change .c-select to .custom-select 2016-01-05 23:34:51 -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
Mark Otto
c081d4802d Merge pull request #18682 from twbs/media-obj-zoom
Remove nonstandard `zoom: 1` from media object
2016-01-05 20:58:39 -08:00
markau
871a003ca2 Fixes #17918: Add styles for disabled custom checkboxes and radios 2016-01-05 00:47:32 -08:00
Mark Otto
6a7577d3c6 remove instances of font-weight: normal since we no longer specify bold labels (as of v4) 2016-01-05 00:14:58 -08:00
Mark Otto
c76a2c3218 Merge pull request #18669 from twbs/fix-18652
Remove .dl-horizontal; it's redundant to the grid system
2016-01-03 19:10:42 -08:00
Chris Rebert
e9192f6de0 Update copyright years to 2016
[ci skip]
2016-01-01 12:31:38 -08:00
Patrick H. Lauke
9cd6903768 Merge pull request #18699 from patrickhlauke/disabled-pointer-events
Add pointer-events:none to disabled pagination/pager links
2015-12-29 16:23:41 +00:00
Sam A. Horvath-Hunt
f7a43ed6b7 Add max-width to file browser; fixes #18651 2015-12-29 14:41:21 +00:00
Patrick H. Lauke
348763d65c Add pointer-events:none to disabled pagination/pager links
as currently this was missed out (compared to disabled `a.btn`)
2015-12-27 10:03:09 +00:00
Bass Jobsen
ddb652b8d5 .container, .container-fluid should be conditional upon $enable-grid-classes
see: https://github.com/twbs/bootstrap/issues/17586
2015-12-27 00:14:01 +01:00
Chris Rebert
4de483a411 Remove nonstandard zoom: 1 from media object
It should be unnecessary since we only support IE>=9, and this hasLayout hack is for IE6-7.
https://developer.mozilla.org/en-US/docs/Web/CSS/zoom
http://stackoverflow.com/questions/1794350/what-is-haslayout

[skip sauce]
[skip validator]
2015-12-25 14:54:48 -07:00
Chris Rebert
4a05f19a3b Fix syntax of .text-hide's font property value
In SCSS, the quotes were included verbatim in the resulting CSS, which isn't valid syntax for the `font` property.
Removing the quotes fixes the syntax error and does not cause any SCSS compiler error.

[skip sauce]
[skip validator]
2015-12-25 14:06:39 -07:00
Chris Rebert
4c86e37c2d Remove .dl-horizontal; it's redundant to the grid system; fixes #18652
[skip sauce]
2015-12-24 21:26:26 -07: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
7cfdc771f8 Uncomment Firefox .progress styles; fixes #18536
[skip sauce]
[skip validator]
2015-12-23 23:19:44 -07:00
Chris Rebert
a96e522d6a Organize existing .progress styles 2015-12-23 22:35:45 -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
7aabd49364 Reorganize utilities into more separate files under a /scss/utilities/ directory
[skip sauce]
[skip validator]
2015-12-23 21:01:17 -07:00
Chris Rebert
1e8743ec89 Merge pull request #18473 from twbs/fix-18036
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
2015-12-23 20:33:37 -07:00
Chris Rebert
25cecdb55a Apply clearfix to .card-footer
[skip sauce]
[skip validator]
2015-12-23 17:25:37 -07:00
Chris Rebert
da533b8926 Apply clearfix to .card-header; fixes #18633 2015-12-23 17:20:23 -07:00
Chris Rebert
2e2b48da13 Apply clearfix to .card-block; fixes #18583 2015-12-23 17:18:19 -07:00
Chris Rebert
646580a919 Actually use $progress-bg instead of hardcoded color
Refs #18535
[skip sauce]
2015-12-21 10:57:57 -07:00
Chris Rebert
c6a276dd74 Set $progress-bg to color we are actually using 2015-12-21 10:57:57 -07:00
Chris Rebert
0917b04711 Actually use $progress-bar-color instead of hardcoded color
Refs #18535
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