From d1e712d84882953b7d2a43a8e70aa3b976da5fcd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 6 Aug 2013 21:11:16 -0700 Subject: fixes #8959: only negative indent rows within .container (prevents horizontal scroll on full-width pages) --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 804daa361..98acfc8dc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -757,7 +757,7 @@ pre code { } @media (min-width: 768px) { - .row { + .container .row { margin-right: -15px; margin-left: -15px; } @@ -1691,7 +1691,7 @@ textarea.input-sm { } @media (min-width: 768px) { - .form-horizontal .form-group { + .container .form-horizontal .form-group { margin-right: -15px; margin-left: -15px; } -- cgit v1.2.3 From a8d95d4721e714a7e1d683e14e997faa5ccddaff Mon Sep 17 00:00:00 2001 From: adamjacobbecker Date: Tue, 6 Aug 2013 21:25:36 -0700 Subject: Improve accessibility (Section 508, WCAG) This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices. What was done - Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria) - Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users. - Advised users to always use label elements. For inline forms, they can hide them with `.sr-only` - Added 'Skip navigation' link - Added "Accessibility" section to getting-started.html. What *wasn't* done - Contrast issues (twbs#3572) - Tooltips (twbs#8469) - Documentation re: usage of icons, since they now live in a separate repo Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out. --- dist/css/bootstrap.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 98acfc8dc..b505bcfb3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -356,6 +356,17 @@ hr { border-top: 1px solid #eeeeee; } +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} + p { margin: 0 0 10px; } -- cgit v1.2.3 From f86f6ee9555819468467d48387becf80c831d34f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 8 Aug 2013 13:29:46 -0700 Subject: fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack fixes typo introduced in 2b6ec389876fac116ae2a152e47be321632dd9ba --- dist/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b505bcfb3..03042ad8b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3830,9 +3830,9 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - background-clip: padding-box; - -webkit-bg-clip: padding-box; - -moz-bg-clip: padding; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .popover.top { -- cgit v1.2.3 From 6b6241feaa56e3d123fc6ff5f176c08747154324 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 12:43:43 -0700 Subject: fixes #9241: enable collapsing for labels, in addition to badges, when empty --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 03042ad8b..65ec51fd0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4127,6 +4127,10 @@ a.thumbnail:focus { cursor: pointer; } +.label:empty { + display: none; +} + .label-default { background-color: #999999; } -- cgit v1.2.3 From 0561cfec6bb0fc0738f9f1cf5f4463e96fa1c33c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 15:01:16 -0700 Subject: fixes #8900: nuke empty space between panel heading and list group --- dist/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 65ec51fd0..cc81264ef 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text { border-bottom: 0; } +.panel-heading + .list-group { + margin-top: -15px; +} + +.panel-heading + .list-group .list-group-item:first-child { + border-top-width: 0; +} + .panel-heading { padding: 10px 15px; margin: -15px -15px 15px; -- cgit v1.2.3 From 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 11 Aug 2013 15:41:06 -0700 Subject: fixes #8983 --- dist/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index cc81264ef..aa791541b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -346,7 +346,7 @@ img { } .img-circle { - border-radius: 500px; + border-radius: 50%; } hr { @@ -4475,7 +4475,6 @@ a.list-group-item.active > .badge, filter: alpha(opacity=90); } -.carousel-control .glyphicon, .carousel-control .icon-prev, .carousel-control .icon-next { position: absolute; -- cgit v1.2.3 From e9650f51bf9e335076ae2890915a99fee82ed9a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 18:10:42 -0700 Subject: addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500 --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index aa791541b..121bfdf2f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4119,7 +4119,7 @@ a.thumbnail:focus { display: inline; padding: .25em .6em; font-size: 75%; - font-weight: 500; + font-weight: bold; line-height: 1; color: #ffffff; text-align: center; -- cgit v1.2.3 From 8bdffecf8f65a7bd4f27ad4d2afb922291a4e4ad Mon Sep 17 00:00:00 2001 From: fat Date: Sun, 11 Aug 2013 18:42:13 -0700 Subject: rebuild + first bit of customizer urls --- dist/css/bootstrap.css | 226 ++++++++++++++++++++++++++++--------------------- 1 file changed, 128 insertions(+), 98 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index aa791541b..e76d42a2e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4663,6 +4663,32 @@ td.visible-sm { display: table-cell !important; } +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: none !important; + } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } +} + +@media (min-width: 992px) { + .visible-sm { + display: none !important; + } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } +} + .visible-md { display: none !important; } @@ -4676,6 +4702,32 @@ td.visible-md { display: none !important; } +@media (min-width: 768px) and (max-width: 991px) { + .visible-md { + display: block !important; + } + tr.visible-md { + display: table-row !important; + } + th.visible-md, + td.visible-md { + display: table-cell !important; + } +} + +@media (min-width: 992px) { + .visible-md { + display: none !important; + } + tr.visible-md { + display: none !important; + } + th.visible-md, + td.visible-md { + display: none !important; + } +} + .visible-lg { display: none !important; } @@ -4689,6 +4741,32 @@ td.visible-lg { display: none !important; } +@media (min-width: 768px) and (max-width: 991px) { + .visible-lg { + display: none !important; + } + tr.visible-lg { + display: none !important; + } + th.visible-lg, + td.visible-lg { + display: none !important; + } +} + +@media (min-width: 992px) { + .visible-lg { + display: block !important; + } + tr.visible-lg { + display: table-row !important; + } + th.visible-lg, + td.visible-lg { + display: table-cell !important; + } +} + .hidden-sm { display: none !important; } @@ -4702,63 +4780,20 @@ td.hidden-sm { display: none !important; } -.hidden-md { - display: block !important; -} - -tr.hidden-md { - display: table-row !important; -} - -th.hidden-md, -td.hidden-md { - display: table-cell !important; -} - -.hidden-lg { - display: block !important; -} - -tr.hidden-lg { - display: table-row !important; -} - -th.hidden-lg, -td.hidden-lg { - display: table-cell !important; -} - @media (min-width: 768px) and (max-width: 991px) { - .visible-sm { - display: none !important; - } - tr.visible-sm { - display: none !important; - } - th.visible-sm, - td.visible-sm { - display: none !important; - } - .visible-md { + .hidden-sm { display: block !important; } - tr.visible-md { + tr.hidden-sm { display: table-row !important; } - th.visible-md, - td.visible-md { + th.hidden-sm, + td.hidden-sm { display: table-cell !important; } - .visible-lg { - display: none !important; - } - tr.visible-lg { - display: none !important; - } - th.visible-lg, - td.visible-lg { - display: none !important; - } +} + +@media (min-width: 992px) { .hidden-sm { display: block !important; } @@ -4769,6 +4804,22 @@ td.hidden-lg { td.hidden-sm { display: table-cell !important; } +} + +.hidden-md { + display: block !important; +} + +tr.hidden-md { + display: table-row !important; +} + +th.hidden-md, +td.hidden-md { + display: table-cell !important; +} + +@media (min-width: 768px) and (max-width: 991px) { .hidden-md { display: none !important; } @@ -4779,69 +4830,48 @@ td.hidden-lg { td.hidden-md { display: none !important; } - .hidden-lg { - display: block !important; - } - tr.hidden-lg { - display: table-row !important; - } - th.hidden-lg, - td.hidden-lg { - display: table-cell !important; - } } @media (min-width: 992px) { - .visible-sm { - display: none !important; - } - tr.visible-sm { - display: none !important; - } - th.visible-sm, - td.visible-sm { - display: none !important; - } - .visible-md { - display: none !important; - } - tr.visible-md { - display: none !important; - } - th.visible-md, - td.visible-md { - display: none !important; - } - .visible-lg { - display: block !important; - } - tr.visible-lg { - display: table-row !important; - } - th.visible-lg, - td.visible-lg { - display: table-cell !important; - } - .hidden-sm { + .hidden-md { display: block !important; } - tr.hidden-sm { + tr.hidden-md { display: table-row !important; } - th.hidden-sm, - td.hidden-sm { + th.hidden-md, + td.hidden-md { display: table-cell !important; } - .hidden-md { +} + +.hidden-lg { + display: block !important; +} + +tr.hidden-lg { + display: table-row !important; +} + +th.hidden-lg, +td.hidden-lg { + display: table-cell !important; +} + +@media (min-width: 768px) and (max-width: 991px) { + .hidden-lg { display: block !important; } - tr.hidden-md { + tr.hidden-lg { display: table-row !important; } - th.hidden-md, - td.hidden-md { + th.hidden-lg, + td.hidden-lg { display: table-cell !important; } +} + +@media (min-width: 992px) { .hidden-lg { display: none !important; } -- cgit v1.2.3 From ba8026e00f85f76e88a4005162612a7568a0a405 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 19:06:26 -0700 Subject: Refactor navbars to simplify things * `.navbar-brand` is no longer centered, thus removing need for max-width and a few lines of code * Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in 2.x, thus simplifying some clearing and other things. * Restyle the `.navbar-toggle` button to align it's bars up with the text and flow of the document. * Restyle the `.navbar-brand` to not use padding on left/right as to avoid negative margin and other fuckery. This limits the ability to put a bg color on the brand, but I think that's fine for now. --- dist/css/bootstrap.css | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 121bfdf2f..689c5f9d9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2829,10 +2829,6 @@ button.close { clear: both; } -.navbar-nav { - margin-bottom: 15px; -} - .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px; @@ -2889,6 +2885,7 @@ button.close { .nav-collapse { padding-bottom: 15px; + clear: both; } .nav-collapse:before, @@ -2926,16 +2923,12 @@ button.close { } .navbar-brand { - display: block; - max-width: 200px; - padding: 15px 15px; - margin-right: auto; - margin-left: auto; + float: left; + padding-top: 15px; + padding-bottom: 15px; font-size: 18px; - font-weight: 500; line-height: 20px; color: #777777; - text-align: center; } .navbar-brand:hover, @@ -2948,10 +2941,9 @@ button.close { .navbar-toggle { position: relative; float: right; - width: 48px; - height: 34px; - padding: 6px 12px; + padding: 9px 10px; margin-top: 8px; + margin-right: -10px; margin-bottom: 8px; background-color: transparent; border: 1px solid #dddddd; @@ -3121,12 +3113,6 @@ button.close { } @media screen and (min-width: 768px) { - .navbar-brand { - float: left; - max-width: none; - margin-right: 5px; - margin-left: -15px; - } .navbar-nav { float: left; margin-top: 0; -- cgit v1.2.3 From 85ec6e741d278623e079528959360b2dbded4794 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 19:19:44 -0700 Subject: Follow up commit: fix collapse clearing and navbar brand/nav spacing --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 689c5f9d9..1ba747478 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2926,6 +2926,7 @@ button.close { float: left; padding-top: 15px; padding-bottom: 15px; + margin-right: 15px; font-size: 18px; line-height: 20px; color: #777777; @@ -3113,6 +3114,9 @@ button.close { } @media screen and (min-width: 768px) { + .nav-collapse { + clear: none; + } .navbar-nav { float: left; margin-top: 0; -- cgit v1.2.3 From bf4900072dba32ba6db36321f6d3175bd4b43718 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 19:20:23 -0700 Subject: Drop the font-weight on panel labels since heading elements already get it --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 1ba747478..7c02bb9d0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2447,7 +2447,6 @@ a.list-group-item.active .list-group-item-text { margin-top: 0; margin-bottom: 0; font-size: 17.5px; - font-weight: 500; } .panel-title > a { -- cgit v1.2.3 From 95affa32e6b756e54cc86b85a352aaa02e65bf9d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 21:17:49 -0700 Subject: simplify padding in list groups and margins on badges within --- dist/css/bootstrap.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ee48db08a..793496b9f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2334,7 +2334,7 @@ input[type="button"].btn-block { .list-group-item { position: relative; display: block; - padding: 10px 30px 10px 15px; + padding: 10px 15px; margin-bottom: -1px; background-color: #ffffff; border: 1px solid #dddddd; @@ -2353,11 +2353,10 @@ input[type="button"].btn-block { .list-group-item > .badge { float: right; - margin-right: -15px; } .list-group-item > .badge + .badge { - margin-right: 0; + margin-right: 5px; } .list-group-item-heading { -- cgit v1.2.3 From a2b9988eb908e5b95fb253aac7fde0fbd61c375e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 00:28:50 -0700 Subject: Media query (grid and responsive utilities) overhaul Grid classes have been changed to account for a fourth set of classes, meaning we now have XS, S, M, and L options. Specifically, we made the following changes: * Renames `.col-` to `.col-xs-` * Adds `.col-md-` for devices 992px wide and up * Remaps `.col-lg-` for devices 1200px wide and up Alongside that, we've updated our media queries to better handle advanced grid layouts: * All column classes now kick in when they hit a `min-width`, undoing the #9128 fix in https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb c690f3a65 * All column offsets, pushes, and pulls are scoped to an appropriate range, meaning a `min-width` and `max-width` (thanks for the idea, @eratzlaff) We've also modified the widths of our grid containers for the small device grid (now a max 720px instead of 728px) and large device grid (now a max 1140px instead of 1170px) to avoid horizontal scrollbar problems in Firefox (likely due to box-sizing, which is why we didn't see it in 2.x). Similarly, we've updated the responsive ultility classes to match the new four media query approach of the grid system. That means we've: * Added new `.visible-xs` and `.hidden-xs` classes * Reassigns visible and hidden classes for small, medium, and large to matching grid system media queries * Updates docs examples to match grid system and account for fourth utility range ----- Fixes the following: * #9135: fourth grid tier * #9302: undoes previous range change for small grid system, so no need to update any docs here * #8755: consistent grid and responsive utilities schemas) * #9195, #9216, and #9227: no more horizontal scrollbars --- dist/css/bootstrap.css | 461 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 405 insertions(+), 56 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 793496b9f..8cb3ff74e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -779,18 +779,18 @@ pre code { margin-left: -15px; } -.col-1, -.col-2, -.col-3, -.col-4, -.col-5, -.col-6, -.col-7, -.col-8, -.col-9, -.col-10, -.col-11, -.col-12, +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11, +.col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, @@ -803,6 +803,18 @@ pre code { .col-sm-10, .col-sm-11, .col-sm-12, +.col-md-1, +.col-md-2, +.col-md-3, +.col-md-4, +.col-md-5, +.col-md-6, +.col-md-7, +.col-md-8, +.col-md-9, +.col-md-10, +.col-md-11, +.col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, @@ -821,72 +833,72 @@ pre code { padding-left: 15px; } -.col-1, -.col-2, -.col-3, -.col-4, -.col-5, -.col-6, -.col-7, -.col-8, -.col-9, -.col-10, -.col-11, -.col-12 { +.col-xs-1, +.col-xs-2, +.col-xs-3, +.col-xs-4, +.col-xs-5, +.col-xs-6, +.col-xs-7, +.col-xs-8, +.col-xs-9, +.col-xs-10, +.col-xs-11, +.col-xs-12 { float: left; } -.col-1 { +.col-xs-1 { width: 8.333333333333332%; } -.col-2 { +.col-xs-2 { width: 16.666666666666664%; } -.col-3 { +.col-xs-3 { width: 25%; } -.col-4 { +.col-xs-4 { width: 33.33333333333333%; } -.col-5 { +.col-xs-5 { width: 41.66666666666667%; } -.col-6 { +.col-xs-6 { width: 50%; } -.col-7 { +.col-xs-7 { width: 58.333333333333336%; } -.col-8 { +.col-xs-8 { width: 66.66666666666666%; } -.col-9 { +.col-xs-9 { width: 75%; } -.col-10 { +.col-xs-10 { width: 83.33333333333334%; } -.col-11 { +.col-xs-11 { width: 91.66666666666666%; } -.col-12 { +.col-xs-12 { width: 100%; } -@media (min-width: 768px) and (max-width: 991px) { +@media (min-width: 768px) { .container { - max-width: 728px; + max-width: 720px; } .col-sm-1, .col-sm-2, @@ -938,6 +950,9 @@ pre code { .col-sm-12 { width: 100%; } +} + +@media (min-width: 768px) and (max-width: 991px) { .col-sm-push-1 { left: 8.333333333333332%; } @@ -1043,6 +1058,164 @@ pre code { .container { max-width: 940px; } + .col-md-1, + .col-md-2, + .col-md-3, + .col-md-4, + .col-md-5, + .col-md-6, + .col-md-7, + .col-md-8, + .col-md-9, + .col-md-10, + .col-md-11, + .col-md-12 { + float: left; + } + .col-md-1 { + width: 8.333333333333332%; + } + .col-md-2 { + width: 16.666666666666664%; + } + .col-md-3 { + width: 25%; + } + .col-md-4 { + width: 33.33333333333333%; + } + .col-md-5 { + width: 41.66666666666667%; + } + .col-md-6 { + width: 50%; + } + .col-md-7 { + width: 58.333333333333336%; + } + .col-md-8 { + width: 66.66666666666666%; + } + .col-md-9 { + width: 75%; + } + .col-md-10 { + width: 83.33333333333334%; + } + .col-md-11 { + width: 91.66666666666666%; + } + .col-md-12 { + width: 100%; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .col-md-push-1 { + left: 8.333333333333332%; + } + .col-md-push-2 { + left: 16.666666666666664%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-4 { + left: 33.33333333333333%; + } + .col-md-push-5 { + left: 41.66666666666667%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-7 { + left: 58.333333333333336%; + } + .col-md-push-8 { + left: 66.66666666666666%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-10 { + left: 83.33333333333334%; + } + .col-md-push-11 { + left: 91.66666666666666%; + } + .col-md-pull-1 { + right: 8.333333333333332%; + } + .col-md-pull-2 { + right: 16.666666666666664%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-4 { + right: 33.33333333333333%; + } + .col-md-pull-5 { + right: 41.66666666666667%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-7 { + right: 58.333333333333336%; + } + .col-md-pull-8 { + right: 66.66666666666666%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-10 { + right: 83.33333333333334%; + } + .col-md-pull-11 { + right: 91.66666666666666%; + } + .col-md-offset-1 { + margin-left: 8.333333333333332%; + } + .col-md-offset-2 { + margin-left: 16.666666666666664%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-4 { + margin-left: 33.33333333333333%; + } + .col-md-offset-5 { + margin-left: 41.66666666666667%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-7 { + margin-left: 58.333333333333336%; + } + .col-md-offset-8 { + margin-left: 66.66666666666666%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-10 { + margin-left: 83.33333333333334%; + } + .col-md-offset-11 { + margin-left: 91.66666666666666%; + } +} + +@media (min-width: 1200px) { + .container { + max-width: 1140px; + } .col-lg-1, .col-lg-2, .col-lg-3, @@ -1194,12 +1367,6 @@ pre code { } } -@media (min-width: 1200px) { - .container { - max-width: 1170px; - } -} - table { max-width: 100%; background-color: transparent; @@ -4638,20 +4805,85 @@ a.list-group-item.active > .badge, visibility: hidden !important; } -.visible-sm { +.visible-xs { display: block !important; } -tr.visible-sm { +tr.visible-xs { display: table-row !important; } +th.visible-xs, +td.visible-xs { + display: table-cell !important; +} + +@media (min-width: 768px) and (max-width: 991px) { + .visible-xs { + display: none !important; + } + tr.visible-xs { + display: none !important; + } + th.visible-xs, + td.visible-xs { + display: none !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .visible-xs { + display: none !important; + } + tr.visible-xs { + display: none !important; + } + th.visible-xs, + td.visible-xs { + display: none !important; + } +} + +@media (min-width: 1200px) { + .visible-xs { + display: none !important; + } + tr.visible-xs { + display: none !important; + } + th.visible-xs, + td.visible-xs { + display: none !important; + } +} + +.visible-sm { + display: none !important; +} + +tr.visible-sm { + display: none !important; +} + th.visible-sm, td.visible-sm { - display: table-cell !important; + display: none !important; } @media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { .visible-sm { display: none !important; } @@ -4664,7 +4896,7 @@ td.visible-sm { } } -@media (min-width: 992px) { +@media (min-width: 1200px) { .visible-sm { display: none !important; } @@ -4691,6 +4923,19 @@ td.visible-md { } @media (min-width: 768px) and (max-width: 991px) { + .visible-md { + display: none !important; + } + tr.visible-md { + display: none !important; + } + th.visible-md, + td.visible-md { + display: none !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; } @@ -4703,7 +4948,7 @@ td.visible-md { } } -@media (min-width: 992px) { +@media (min-width: 1200px) { .visible-md { display: none !important; } @@ -4742,7 +4987,20 @@ td.visible-lg { } } -@media (min-width: 992px) { +@media (min-width: 992px) and (max-width: 1199px) { + .visible-lg { + display: none !important; + } + tr.visible-lg { + display: none !important; + } + th.visible-lg, + td.visible-lg { + display: none !important; + } +} + +@media (min-width: 1200px) { .visible-lg { display: block !important; } @@ -4755,20 +5013,85 @@ td.visible-lg { } } -.hidden-sm { +.hidden-xs { display: none !important; } -tr.hidden-sm { +tr.hidden-xs { display: none !important; } +th.hidden-xs, +td.hidden-xs { + display: none !important; +} + +@media (min-width: 768px) and (max-width: 991px) { + .hidden-xs { + display: block !important; + } + tr.hidden-xs { + display: table-row !important; + } + th.hidden-xs, + td.hidden-xs { + display: table-cell !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-xs { + display: block !important; + } + tr.hidden-xs { + display: table-row !important; + } + th.hidden-xs, + td.hidden-xs { + display: table-cell !important; + } +} + +@media (min-width: 1200px) { + .hidden-xs { + display: block !important; + } + tr.hidden-xs { + display: table-row !important; + } + th.hidden-xs, + td.hidden-xs { + display: table-cell !important; + } +} + +.hidden-sm { + display: block !important; +} + +tr.hidden-sm { + display: table-row !important; +} + th.hidden-sm, td.hidden-sm { - display: none !important; + display: table-cell !important; } @media (min-width: 768px) and (max-width: 991px) { + .hidden-sm { + display: none !important; + } + tr.hidden-sm { + display: none !important; + } + th.hidden-sm, + td.hidden-sm { + display: none !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { .hidden-sm { display: block !important; } @@ -4781,7 +5104,7 @@ td.hidden-sm { } } -@media (min-width: 992px) { +@media (min-width: 1200px) { .hidden-sm { display: block !important; } @@ -4808,6 +5131,19 @@ td.hidden-md { } @media (min-width: 768px) and (max-width: 991px) { + .hidden-md { + display: block !important; + } + tr.hidden-md { + display: table-row !important; + } + th.hidden-md, + td.hidden-md { + display: table-cell !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { .hidden-md { display: none !important; } @@ -4820,7 +5156,7 @@ td.hidden-md { } } -@media (min-width: 992px) { +@media (min-width: 1200px) { .hidden-md { display: block !important; } @@ -4859,7 +5195,20 @@ td.hidden-lg { } } -@media (min-width: 992px) { +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-lg { + display: block !important; + } + tr.hidden-lg { + display: table-row !important; + } + th.hidden-lg, + td.hidden-lg { + display: table-cell !important; + } +} + +@media (min-width: 1200px) { .hidden-lg { display: none !important; } -- cgit v1.2.3 From 6dbf588237529fc8909bf65caa103fd4fc224fbc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 01:20:22 -0700 Subject: fixes #9310: alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button --- dist/css/bootstrap.css | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8cb3ff74e..128e3ac2b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4117,7 +4117,7 @@ button.close { } .alert { - padding: 15px 35px 15px 15px; + padding: 15px; margin-bottom: 20px; color: #c09853; background-color: #fcf8e3; @@ -4139,13 +4139,6 @@ button.close { color: #a47e3c; } -.alert .close { - position: relative; - top: -2px; - right: -21px; - color: inherit; -} - .alert > p, .alert > ul { margin-bottom: 0; @@ -4155,6 +4148,17 @@ button.close { margin-top: 5px; } +.alert-dismissable { + padding-right: 35px; +} + +.alert-dismissable .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; +} + .alert-success { color: #468847; background-color: #dff0d8; -- cgit v1.2.3 From acdbe738517b592d8a92fb7c94da09c20d5e65f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 01:38:06 -0700 Subject: fixes #8835: make it so active list group items aren't dependent on an tag --- dist/css/bootstrap.css | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 128e3ac2b..6741ef889 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2526,16 +2526,6 @@ input[type="button"].btn-block { margin-right: 5px; } -.list-group-item-heading { - margin-top: 0; - margin-bottom: 5px; -} - -.list-group-item-text { - margin-bottom: 0; - line-height: 1.3; -} - a.list-group-item .list-group-item-heading { color: #333333; } @@ -2550,21 +2540,37 @@ a.list-group-item:focus { background-color: #f5f5f5; } -a.list-group-item.active { +.list-group-item.active, +.list-group-item.active:hover, +.list-group-item.active:focus { z-index: 2; color: #ffffff; background-color: #428bca; border-color: #428bca; } -a.list-group-item.active .list-group-item-heading { +.list-group-item.active .list-group-item-heading, +.list-group-item.active:hover .list-group-item-heading, +.list-group-item.active:focus .list-group-item-heading { color: inherit; } -a.list-group-item.active .list-group-item-text { +.list-group-item.active .list-group-item-text, +.list-group-item.active:hover .list-group-item-text, +.list-group-item.active:focus .list-group-item-text { color: #e1edf7; } +.list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} + +.list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} + .panel { padding: 15px; margin-bottom: 20px; -- cgit v1.2.3 From 5e73cc90d9104dc251fba5dcaf203523785ee9a5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 01:39:43 -0700 Subject: fixes #9266 manually on account of list group file reorganization --- dist/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6741ef889..096357486 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2526,12 +2526,12 @@ input[type="button"].btn-block { margin-right: 5px; } -a.list-group-item .list-group-item-heading { - color: #333333; +a.list-group-item { + color: #555555; } -a.list-group-item .list-group-item-text { - color: #555555; +a.list-group-item .list-group-item-heading { + color: #333333; } a.list-group-item:hover, -- cgit v1.2.3 From 175a112548120500022882d6d2e9bede720f568b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 01:56:38 -0700 Subject: fix #9239 by restoring old ie8 responsive img foo --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 096357486..fb2b9d18a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2815,6 +2815,10 @@ button.close { background-color: #e5e5e5; } +.nav > li > a > img { + max-width: none; +} + .nav-tabs { border-bottom: 1px solid #dddddd; } -- cgit v1.2.3 From 55cfa8d38f71623aaa5e2aae97b483af60650910 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 10:01:13 -0700 Subject: Drop background-clip and background-size mixins since they have no prefixes anyway --- dist/css/bootstrap.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index fb2b9d18a..3f13551b3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4003,9 +4003,7 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + background-clip: padding-box; } .popover.top { -- cgit v1.2.3 From f662dff6e9c52770511e5f674579a27eeac85549 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 11:07:23 -0700 Subject: fixes #9382: inline forms now require use of .form-group for proper alignment of all form controls --- dist/css/bootstrap.css | 77 +++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 35 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 3f13551b3..47cdeedc1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1823,23 +1823,27 @@ textarea.input-sm { color: #737373; } -.form-inline .form-control, -.form-inline .radio, -.form-inline .checkbox { - display: inline-block; -} - -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-top: 0; - margin-bottom: 0; -} - -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: none; - margin-left: 0; +@media (min-width: 768px) { + .form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .form-inline .form-control { + width: auto; + } + .form-inline .radio, + .form-inline .checkbox { + display: inline-block; + padding-left: 0; + margin-top: 0; + margin-bottom: 0; + } + .form-inline .radio input[type="radio"], + .form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } } .form-horizontal .control-label, @@ -3148,23 +3152,27 @@ button.close { margin-bottom: 8px; } -.navbar-form .form-control, -.navbar-form .radio, -.navbar-form .checkbox { - display: inline-block; -} - -.navbar-form .radio, -.navbar-form .checkbox { - padding-left: 0; - margin-top: 0; - margin-bottom: 0; -} - -.navbar-form .radio input[type="radio"], -.navbar-form .checkbox input[type="checkbox"] { - float: none; - margin-left: 0; +@media (min-width: 768px) { + .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .navbar-form .form-control { + width: auto; + } + .navbar-form .radio, + .navbar-form .checkbox { + display: inline-block; + padding-left: 0; + margin-top: 0; + margin-bottom: 0; + } + .navbar-form .radio input[type="radio"], + .navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } } .navbar-nav > li > .dropdown-menu { @@ -4712,7 +4720,6 @@ a.list-group-item.active > .badge, } @media screen and (min-width: 768px) { - .carousel-control .glyphicon, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; -- cgit v1.2.3 From 9564c356d32168ccb9a9c28e6b51d08234993754 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 11:34:28 -0700 Subject: inherit font-size in code when inside pre --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 47cdeedc1..b1cc33725 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -711,6 +711,7 @@ pre.prettyprint { pre code { padding: 0; + font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; -- cgit v1.2.3 From a78c8d9c04e83a22d6eebc2e3d54cb2ccf6b614c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 14:03:57 -0700 Subject: Newfangled input and button group sizing (fixes #9295) Instead of applying `.btn-` or `.input-` to individual elements in button and input groups, we now have new sizing classes to keep your markup a little leaner. * Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to replicate `.input-sm` and `.input-lg`, respectively. * Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your `.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`, respectively. Both sets of new sizing classes simply use the existing individual sizing classes as mixins, so customization of them is automatically inherited when compiling. --- dist/css/bootstrap.css | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b1cc33725..f80d8b8a5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2262,6 +2262,24 @@ input[type="button"].btn-block { margin-bottom: 0; } +.input-group-lg > .form-control, +.input-group-lg > .input-group-addon { + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} + +.input-group-sm > .form-control, +.input-group-sm > .input-group-addon { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} + .input-group-addon, .input-group-btn, .input-group .form-control { @@ -3487,6 +3505,28 @@ button.close { outline: 0; } +.btn-group-xs > .btn { + padding: 5px 10px; + padding: 3px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} + +.btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} + +.btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} + .btn-group > .btn + .dropdown-toggle { padding-right: 8px; padding-left: 8px; -- cgit v1.2.3 From eb1565681fc526c7f75b90ae3dae1d82b47eb4b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 14:52:49 -0700 Subject: fixes #9392: no need for width auto on inline/navbar form controls given inline-block on parent form group --- dist/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f80d8b8a5..4094741ca 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1830,9 +1830,6 @@ textarea.input-sm { margin-bottom: 0; vertical-align: middle; } - .form-inline .form-control { - width: auto; - } .form-inline .radio, .form-inline .checkbox { display: inline-block; @@ -3177,9 +3174,6 @@ button.close { margin-bottom: 0; vertical-align: middle; } - .navbar-form .form-control { - width: auto; - } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; -- cgit v1.2.3 From 394f6980567c0adcb80553e2b510abab588d4c53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 15:02:09 -0700 Subject: undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) --- dist/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4094741ca..e39beb570 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -951,9 +951,6 @@ pre code { .col-sm-12 { width: 100%; } -} - -@media (min-width: 768px) and (max-width: 991px) { .col-sm-push-1 { left: 8.333333333333332%; } @@ -1109,9 +1106,6 @@ pre code { .col-md-12 { width: 100%; } -} - -@media (min-width: 992px) and (max-width: 1199px) { .col-md-push-1 { left: 8.333333333333332%; } -- cgit v1.2.3 From fb8ae7e51499c93f5db1aae94c74dc845b884630 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 15:46:11 -0700 Subject: drop the class on the button group toggles CSS (alt fix to #9297) --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e39beb570..9834bc105 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3579,8 +3579,8 @@ button.close { width: 1%; } -.btn-group[data-toggle="buttons"] > .btn > input[type="radio"], -.btn-group[data-toggle="buttons"] > .btn > input[type="checkbox"] { +[data-toggle="buttons"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { display: none; } -- cgit v1.2.3 From c558c035d7eee68276c76246260913663029f1dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 16:02:27 -0700 Subject: fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes --- dist/css/bootstrap.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9834bc105..5c88d994e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -844,8 +844,7 @@ pre code { .col-xs-8, .col-xs-9, .col-xs-10, -.col-xs-11, -.col-xs-12 { +.col-xs-11 { float: left; } @@ -911,8 +910,7 @@ pre code { .col-sm-8, .col-sm-9, .col-sm-10, - .col-sm-11, - .col-sm-12 { + .col-sm-11 { float: left; } .col-sm-1 { @@ -1066,8 +1064,7 @@ pre code { .col-md-8, .col-md-9, .col-md-10, - .col-md-11, - .col-md-12 { + .col-md-11 { float: left; } .col-md-1 { @@ -1221,8 +1218,7 @@ pre code { .col-lg-8, .col-lg-9, .col-lg-10, - .col-lg-11, - .col-lg-12 { + .col-lg-11 { float: left; } .col-lg-1 { -- cgit v1.2.3 From eac61de138278aa1c0d70dfed7a9515c714b6ad9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 16:09:21 -0700 Subject: fix navbar form alignment of inputs by restoring inline-block --- dist/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5c88d994e..9046102c9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1820,6 +1820,9 @@ textarea.input-sm { margin-bottom: 0; vertical-align: middle; } + .form-inline .form-control { + display: inline-block; + } .form-inline .radio, .form-inline .checkbox { display: inline-block; @@ -3164,6 +3167,9 @@ button.close { margin-bottom: 0; vertical-align: middle; } + .navbar-form .form-control { + display: inline-block; + } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; -- cgit v1.2.3 From 8bb7def26cac4d3166fbf2cc98f16c4151794676 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:23:28 -0700 Subject: Navbar refactor * Now responsive by default (fits better with mobile-first approach) * Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle` for proper mobile display. * Changed `.nav-collapse` to `.navbar-collapse` * Simplified examples in docs --- dist/css/bootstrap.css | 236 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 170 insertions(+), 66 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9046102c9..59901bef6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2377,6 +2377,10 @@ input[type="button"].btn-block { position: relative; } +.dropdown-toggle:focus { + outline: 0; +} + .dropdown-menu { position: absolute; top: 100%; @@ -2990,11 +2994,8 @@ button.close { .navbar { position: relative; min-height: 50px; - padding-right: 15px; - padding-left: 15px; margin-bottom: 20px; background-color: #eeeeee; - border-radius: 4px; } .navbar:before, @@ -3017,104 +3018,118 @@ button.close { clear: both; } -.navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; - line-height: 20px; - color: #777777; - border-radius: 4px; +@media (min-width: 768px) { + .navbar { + border-radius: 4px; + } } -.navbar-nav > li > a:hover, -.navbar-nav > li > a:focus { - color: #333333; - background-color: transparent; +.navbar-header { + padding-right: 15px; + padding-left: 15px; } -.navbar-nav > .active > a, -.navbar-nav > .active > a:hover, -.navbar-nav > .active > a:focus { - color: #555555; - background-color: #d5d5d5; +.navbar-header:before, +.navbar-header:after { + display: table; + content: " "; } -.navbar-nav > .disabled > a, -.navbar-nav > .disabled > a:hover, -.navbar-nav > .disabled > a:focus { - color: #cccccc; - background-color: transparent; +.navbar-header:after { + clear: both; } -.navbar-nav.pull-right { - width: 100%; +.navbar-header:before, +.navbar-header:after { + display: table; + content: " "; } -.navbar-static-top { - border-radius: 0; +.navbar-header:after { + clear: both; } -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - border-radius: 0; +@media (min-width: 768px) { + .navbar-header { + float: left; + } } -.navbar-fixed-top { - top: 0; +.navbar-collapse { + max-height: 360px; + padding-top: 5px; + padding-bottom: 5px; + overflow-x: visible; + overflow-y: scroll; + border-top: 1px solid #dcdcdc; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-overflow-scrolling: touch; } -.navbar-fixed-bottom { - bottom: 0; - margin-bottom: 0; +.navbar-collapse:before, +.navbar-collapse:after { + display: table; + content: " "; } -.nav-collapse { - padding-bottom: 15px; +.navbar-collapse:after { clear: both; } -.nav-collapse:before, -.nav-collapse:after { +.navbar-collapse:before, +.navbar-collapse:after { display: table; content: " "; } -.nav-collapse:after { +.navbar-collapse:after { clear: both; } -.nav-collapse:before, -.nav-collapse:after { - display: table; - content: " "; +@media (min-width: 768px) { + .navbar-collapse { + width: auto; + padding-top: 0; + padding-bottom: 0; + border-top: 0; + } } -.nav-collapse:after { - clear: both; +@media (min-width: 768px) { + .navbar-static-top { + border-radius: 0; + } } -.navbar-toggle + .nav-collapse { - width: 100%; - margin-top: 50px; +.navbar-fixed-top, +.navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + z-index: 1030; } -@media (max-width: 768px) { - .nav-collapse-scrollable { - max-height: 360px; - margin-bottom: 15px; - overflow-y: scroll; - -webkit-overflow-scrolling: touch; +@media (min-width: 768px) { + .navbar-fixed-top, + .navbar-fixed-bottom { + border-radius: 0; } } +.navbar-fixed-top { + top: 0; +} + +.navbar-fixed-bottom { + bottom: 0; + margin-bottom: 0; +} + .navbar-brand { float: left; padding-top: 15px; padding-bottom: 15px; - margin-right: 15px; + margin-right: 7.5px; font-size: 18px; line-height: 20px; color: #777777; @@ -3132,7 +3147,6 @@ button.close { float: right; padding: 9px 10px; margin-top: 8px; - margin-right: -10px; margin-bottom: 8px; background-color: transparent; border: 1px solid #dddddd; @@ -3156,9 +3170,82 @@ button.close { margin-top: 4px; } +.navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + line-height: 20px; + color: #777777; +} + +.navbar-nav > li > a:hover, +.navbar-nav > li > a:focus { + color: #333333; + background-color: transparent; +} + +.navbar-nav > .active > a, +.navbar-nav > .active > a:hover, +.navbar-nav > .active > a:focus { + color: #555555; + background-color: #d5d5d5; +} + +.navbar-nav > .disabled > a, +.navbar-nav > .disabled > a:hover, +.navbar-nav > .disabled > a:focus { + color: #cccccc; + background-color: transparent; +} + +.navbar-nav.pull-right { + width: 100%; +} + +@media (max-width: 767px) { + .navbar-nav .open .dropdown-menu { + position: static; + float: none; + width: auto; + margin-top: 0; + background-color: transparent; + border: 0; + box-shadow: none; + } + .navbar-nav .open .dropdown-menu > li > a, + .navbar-nav .open .dropdown-menu .dropdown-header { + padding: 5px 15px 5px 25px; + } + .navbar-nav .open .dropdown-menu > li > a { + line-height: 20px; + color: #777777; + } + .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333333; + background-color: transparent; + background-image: none; + } + .navbar-nav .open .dropdown-menu > .active > a, + .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555555; + background-color: #d5d5d5; + } + .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #cccccc; + background-color: transparent; + } +} + .navbar-form { + width: 100%; + padding: 10px 15px; margin-top: 8px; margin-bottom: 8px; + border-top: 1px solid #dcdcdc; + border-bottom: 1px solid #dcdcdc; } @media (min-width: 768px) { @@ -3184,6 +3271,21 @@ button.close { } } +@media (max-width: 767px) { + .navbar-form .form-group { + margin-bottom: 5px; + } +} + +@media (min-width: 768px) { + .navbar-form { + width: auto; + padding-top: 0; + padding-bottom: 0; + border: 0; + } +} + .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; @@ -3281,6 +3383,10 @@ button.close { background-color: #ffffff; } +.navbar-inverse .navbar-collapse { + border-top-color: #101010; +} + .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { @@ -3306,9 +3412,6 @@ button.close { } @media screen and (min-width: 768px) { - .nav-collapse { - clear: none; - } .navbar-nav { float: left; margin-top: 0; @@ -3318,7 +3421,8 @@ button.close { float: left; } .navbar-nav > li > a { - border-radius: 0; + padding-top: 15px; + padding-bottom: 15px; } .navbar-nav.pull-right { width: auto; @@ -3329,7 +3433,7 @@ button.close { left: auto; display: none; } - .nav-collapse.collapse { + .navbar-collapse.collapse { display: block !important; height: auto !important; padding-bottom: 0; -- cgit v1.2.3 From 40723c8716d79e5f27791caa2da5787151a6ee6b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:26:43 -0700 Subject: fixes #9400: add box-sizing to pseudo elements as well --- dist/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9046102c9..0987b7a1d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -286,7 +286,9 @@ table { } } -* { +*, +*:before, +*:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -- cgit v1.2.3 From 49576704ea6c24fbc4cb32f44c5986a1e7714634 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:27:15 -0700 Subject: finish fixing #9295: add button group buttons to new input group sizing --- dist/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0987b7a1d..5ab29f216 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2255,7 +2255,8 @@ input[type="button"].btn-block { } .input-group-lg > .form-control, -.input-group-lg > .input-group-addon { +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { height: 45px; padding: 10px 16px; font-size: 18px; @@ -2264,7 +2265,8 @@ input[type="button"].btn-block { } .input-group-sm > .form-control, -.input-group-sm > .input-group-addon { +.input-group-sm > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; -- cgit v1.2.3 From 48e7468e3acc70ace27ed37cfbadfc54d88a689f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:43:59 -0700 Subject: invert dropdown styles in navbar for inverse variation --- dist/css/bootstrap.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 364047ee3..ed796bbb7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3415,6 +3415,29 @@ button.close { border-bottom-color: #ffffff; } +@media (max-width: 767px) { + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { + color: #999999; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + color: #ffffff; + background-color: transparent; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #ffffff; + background-color: #080808; + } + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #444444; + background-color: transparent; + } +} + @media screen and (min-width: 768px) { .navbar-nav { float: left; -- cgit v1.2.3 From 237640c70697ffa0605770dee625d9e3c6abf479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 23:36:25 -0700 Subject: Drop the accordion for the panel * Deletes the accordion.less file * Extends the panel to be collapsible with our JS plugin * Supports panel color variations --- dist/css/bootstrap.css | 79 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5ab29f216..136bd9f5b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2589,7 +2589,6 @@ a.list-group-item:focus { } .panel { - padding: 15px; margin-bottom: 20px; background-color: #ffffff; border: 1px solid #dddddd; @@ -2598,8 +2597,12 @@ a.list-group-item:focus { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } +.panel-body { + padding: 15px; +} + .panel .list-group { - margin: 15px -15px -15px; + margin-bottom: 0; } .panel .list-group .list-group-item { @@ -2615,17 +2618,12 @@ a.list-group-item:focus { border-bottom: 0; } -.panel-heading + .list-group { - margin-top: -15px; -} - .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } .panel-heading { padding: 10px 15px; - margin: -15px -15px 15px; background-color: #f5f5f5; border-bottom: 1px solid #dddddd; border-top-right-radius: 3px; @@ -2644,13 +2642,38 @@ a.list-group-item:focus { .panel-footer { padding: 10px 15px; - margin: 15px -15px -15px; background-color: #f5f5f5; border-top: 1px solid #dddddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel-group .panel { + margin-bottom: 0; + overflow: hidden; + border-radius: 4px; +} + +.panel-group .panel + .panel { + margin-top: 5px; +} + +.panel-group .panel-heading { + border-bottom: 0; +} + +.panel-group .panel-heading + .panel-collapse .panel-body { + border-top: 1px solid #dddddd; +} + +.panel-group .panel-footer { + border-top: 0; +} + +.panel-group .panel-footer + .panel-collapse .panel-body { + border-bottom: 1px solid #dddddd; +} + .panel-primary { border-color: #428bca; } @@ -2661,6 +2684,14 @@ a.list-group-item:focus { border-color: #428bca; } +.panel-primary .panel-heading + .panel-collapse .panel-body { + border-top-color: #428bca; +} + +.panel-primary .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #428bca; +} + .panel-success { border-color: #d6e9c6; } @@ -2671,6 +2702,14 @@ a.list-group-item:focus { border-color: #d6e9c6; } +.panel-success .panel-heading + .panel-collapse .panel-body { + border-top-color: #d6e9c6; +} + +.panel-success .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #d6e9c6; +} + .panel-warning { border-color: #fbeed5; } @@ -2681,6 +2720,14 @@ a.list-group-item:focus { border-color: #fbeed5; } +.panel-warning .panel-heading + .panel-collapse .panel-body { + border-top-color: #fbeed5; +} + +.panel-warning .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #fbeed5; +} + .panel-danger { border-color: #eed3d7; } @@ -2691,6 +2738,14 @@ a.list-group-item:focus { border-color: #eed3d7; } +.panel-danger .panel-heading + .panel-collapse .panel-body { + border-top-color: #eed3d7; +} + +.panel-danger .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #eed3d7; +} + .panel-info { border-color: #bce8f1; } @@ -2701,6 +2756,14 @@ a.list-group-item:focus { border-color: #bce8f1; } +.panel-info .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} + +.panel-info .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} + .well { min-height: 20px; padding: 19px; -- cgit v1.2.3 From b0ab806dcc3c5d64a80f34acefeb3ac75e860b33 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 23:44:50 -0700 Subject: fix negative indenting in button group for nested button groups --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5ab29f216..66a62ae04 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3421,7 +3421,10 @@ button.close { outline: none; } -.btn-group .btn + .btn { +.btn-group .btn + .btn, +.btn-group .btn + .btn-group, +.btn-group .btn-group + .btn, +.btn-group .btn-group + .btn-group { margin-left: -1px; } -- cgit v1.2.3 From f15f259876d77004fadf5b5937af5ab6b5eabb8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 09:59:38 -0700 Subject: derp --- dist/css/bootstrap.css | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 66a62ae04..91b66ec7a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3551,28 +3551,52 @@ button.close { border-bottom-width: 5px; } -.btn-group-vertical > .btn { +.btn-group-vertical > .btn, +.btn-group-vertical > .btn-group { display: block; float: none; width: 100%; max-width: 100%; } -.btn-group-vertical > .btn + .btn { +.btn-group-vertical .btn + .btn, +.btn-group-vertical .btn + .btn-group, +.btn-group-vertical .btn-group + .btn, +.btn-group-vertical .btn-group + .btn-group { margin-top: -1px; + margin-left: 0; } -.btn-group-vertical .btn:not(:first-child):not(:last-child) { +.btn-group-vertical > .btn:not(:first-child):not(:last-child) { border-radius: 0; } -.btn-group-vertical .btn:first-child:not(:last-child) { +.btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.btn-group-vertical .btn:last-child:not(:first-child) { +.btn-group-vertical > .btn:last-child:not(:first-child) { border-top-right-radius: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 0; +} + +.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} + +.btn-group-vertical > .btn-group:first-child > .btn:last-child, +.btn-group-vertical > .btn-group:first-child > .dropdown-toggle { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.btn-group-vertical > .btn-group:last-child > .btn:first-child { + border-top-right-radius: 0; + border-bottom-left-radius: 4px; border-top-left-radius: 0; } -- cgit v1.2.3 From 69a3e9b4d07cdaa281525c067f11ea83e1863f1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 10:24:18 -0700 Subject: enable button groups in vertical button groups --- dist/css/bootstrap.css | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 91b66ec7a..324fdd754 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3559,10 +3559,34 @@ button.close { max-width: 100%; } -.btn-group-vertical .btn + .btn, -.btn-group-vertical .btn + .btn-group, -.btn-group-vertical .btn-group + .btn, -.btn-group-vertical .btn-group + .btn-group { +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after { + display: table; + content: " "; +} + +.btn-group-vertical > .btn-group:after { + clear: both; +} + +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after { + display: table; + content: " "; +} + +.btn-group-vertical > .btn-group:after { + clear: both; +} + +.btn-group-vertical > .btn-group > .btn { + float: none; +} + +.btn-group-vertical > .btn + .btn, +.btn-group-vertical > .btn + .btn-group, +.btn-group-vertical > .btn-group + .btn, +.btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0; } @@ -3589,14 +3613,12 @@ button.close { .btn-group-vertical > .btn-group:first-child > .btn:last-child, .btn-group-vertical > .btn-group:first-child > .dropdown-toggle { - border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .btn-group-vertical > .btn-group:last-child > .btn:first-child { border-top-right-radius: 0; - border-bottom-left-radius: 4px; border-top-left-radius: 0; } -- cgit v1.2.3 From 270af4dda31692eb22d48d56db5c98a0c89f4c28 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 13:16:56 -0700 Subject: fixes #9431: specify font-size in dropdown menus to avoid inheritance issues --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index cccd9f1a6..682b6d530 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2420,6 +2420,7 @@ textarea.input-group-lg > .input-group-btn > .btn { min-width: 160px; padding: 5px 0; margin: 2px 0 0; + font-size: 14px; list-style: none; background-color: #ffffff; border: 1px solid #cccccc; -- cgit v1.2.3 From 3c772b1cebfed73570247691917b40fcf3d95aa2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 13:39:21 -0700 Subject: lighter default navbar, add borders to navbars, tweak padding and alignments --- dist/css/bootstrap.css | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ed796bbb7..bf8cf26d6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2999,7 +2999,8 @@ button.close { position: relative; min-height: 50px; margin-bottom: 20px; - background-color: #eeeeee; + background-color: #f8f8f8; + border: 1px solid #e7e7e7; } .navbar:before, @@ -3061,11 +3062,10 @@ button.close { .navbar-collapse { max-height: 360px; - padding-top: 5px; - padding-bottom: 5px; + padding: 5px 15px; overflow-x: visible; overflow-y: scroll; - border-top: 1px solid #dcdcdc; + border-top: 1px solid #e6e6e6; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; } @@ -3101,6 +3101,7 @@ button.close { @media (min-width: 768px) { .navbar-static-top { + border-width: 0 0 1px; border-radius: 0; } } @@ -3111,6 +3112,7 @@ button.close { right: 0; left: 0; z-index: 1030; + border-width: 0 0 1px; } @media (min-width: 768px) { @@ -3174,6 +3176,18 @@ button.close { margin-top: 4px; } +.navbar-nav { + margin-right: -15px; + margin-left: -15px; +} + +@media (min-width: 768px) { + .navbar-nav { + margin-right: 0; + margin-left: 0; + } +} + .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; @@ -3191,7 +3205,7 @@ button.close { .navbar-nav > .active > a:hover, .navbar-nav > .active > a:focus { color: #555555; - background-color: #d5d5d5; + background-color: #e7e7e7; } .navbar-nav > .disabled > a, @@ -3233,7 +3247,7 @@ button.close { .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555555; - background-color: #d5d5d5; + background-color: #e7e7e7; } .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-nav .open .dropdown-menu > .disabled > a:hover, @@ -3248,8 +3262,8 @@ button.close { padding: 10px 15px; margin-top: 8px; margin-bottom: 8px; - border-top: 1px solid #dcdcdc; - border-bottom: 1px solid #dcdcdc; + border-top: 1px solid #e6e6e6; + border-bottom: 1px solid #e6e6e6; } @media (min-width: 768px) { @@ -3311,7 +3325,7 @@ button.close { .navbar-nav > .open > a:hover, .navbar-nav > .open > a:focus { color: #555555; - background-color: #d5d5d5; + background-color: #e7e7e7; } .navbar-nav > .open > a .caret, @@ -3334,6 +3348,7 @@ button.close { .navbar-inverse { background-color: #222222; + border-color: #080808; } .navbar-inverse .navbar-brand { @@ -3474,7 +3489,6 @@ button.close { .navbar-text { float: left; - padding: 0 15px; margin-top: 15px; margin-bottom: 15px; } -- cgit v1.2.3 From 2bc67b334d756f7aa26aabcc337fb4e6f6545e6b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 14:46:34 -0700 Subject: nuke the box-shadow on uncollapsed navbar-collapse --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 12ff99380..d02822ff4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3189,6 +3189,7 @@ button.close { padding-top: 0; padding-bottom: 0; border-top: 0; + box-shadow: none; } } -- cgit v1.2.3 From 8d2948c0d6d5b9f753e917aa36fe43549e696e97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 14:56:58 -0700 Subject: grunt dist on prev forms change --- dist/css/bootstrap.css | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d02822ff4..4b32229bc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1705,16 +1705,16 @@ textarea.form-control { } .input-sm { - height: 45px; - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } select.input-sm { - height: 45px; - line-height: 45px; + height: 30px; + line-height: 30px; } textarea.input-sm { @@ -1722,16 +1722,16 @@ textarea.input-sm { } .input-lg { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; } select.input-lg { - height: 30px; - line-height: 30px; + height: 45px; + line-height: 45px; } textarea.input-lg { @@ -2260,18 +2260,18 @@ input[type="button"].btn-block { .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 30px; - line-height: 30px; + height: 45px; + line-height: 45px; } textarea.input-group-lg > .form-control, @@ -2283,18 +2283,18 @@ textarea.input-group-lg > .input-group-btn > .btn { .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 45px; - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; + height: 30px; + line-height: 30px; } textarea.input-group-sm > .form-control, -- cgit v1.2.3 From fa330f308aace22886fee3dbacbcbd4f8adb0fe6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 15:19:59 -0700 Subject: Overhaul navbar alignment (.pull-) utilities (fixes #9440) Now navbars have their own float utility classes, mixin-ed versions of `.pull-left` and `.pull-right`. * Removed chained `.navbar-nav.pull-right` * Added `.navbar-left` and `.navbar-right` as mixins of the default float utilities, but only above the `@grid-float-breakpoint` to match the new navbar behavior * Updated components docs to match the new changeas * Added callout about component alignment here to explain the new classes --- dist/css/bootstrap.css | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4b32229bc..4a2806e45 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3309,10 +3309,6 @@ button.close { background-color: transparent; } -.navbar-nav.pull-right { - width: 100%; -} - @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; @@ -3351,11 +3347,21 @@ button.close { } } +@media (min-width: 768px) { + .navbar-left { + float: left !important; + } + .navbar-right { + float: right !important; + } +} + .navbar-form { - width: 100%; padding: 10px 15px; margin-top: 8px; + margin-right: -15px; margin-bottom: 8px; + margin-left: -15px; border-top: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; } @@ -3394,6 +3400,8 @@ button.close { width: auto; padding-top: 0; padding-bottom: 0; + margin-right: 0; + margin-left: 0; border: 0; } } @@ -3525,6 +3533,9 @@ button.close { } @media (max-width: 767px) { + .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } @@ -3560,9 +3571,6 @@ button.close { padding-top: 15px; padding-bottom: 15px; } - .navbar-nav.pull-right { - width: auto; - } .navbar-toggle { position: relative; top: auto; -- cgit v1.2.3 From 5b4fe08f42ec433d0f193d75dbaac8e6dacae526 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 15:22:05 -0700 Subject: fixes #9439: use overflow: auto on navbar collapse --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4a2806e45..4a0565a70 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3154,10 +3154,10 @@ button.close { } .navbar-collapse { - max-height: 360px; + max-height: 340px; padding: 5px 15px; overflow-x: visible; - overflow-y: scroll; + overflow-y: auto; border-top: 1px solid #e6e6e6; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; -- cgit v1.2.3 From e29c2d0c246dee59c22c4b39d03e3c53963b1889 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Tue, 13 Aug 2013 22:30:02 -0400 Subject: Fix .navbar-right > .dropdown-menu alignment --- dist/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4a0565a70..2135b6270 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3352,6 +3352,8 @@ button.close { float: left !important; } .navbar-right { + right: 0; + left: auto; float: right !important; } } -- cgit v1.2.3 From 09e1f69d3e5c7b2f8d68e757701d48811c1a0b65 Mon Sep 17 00:00:00 2001 From: Jason Harbert Date: Tue, 13 Aug 2013 19:40:12 -0700 Subject: fixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no longer visible --- dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4a0565a70..671e6587f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3190,6 +3190,7 @@ button.close { padding-bottom: 0; border-top: 0; box-shadow: none; + overflow-y: visible; } } @@ -5576,4 +5577,4 @@ td.visible-print { td.hidden-print { display: none !important; } -} \ No newline at end of file +} -- cgit v1.2.3 From c79fa6ad044b0731ce04fcadaae9604bd764aadb Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Tue, 13 Aug 2013 22:53:23 -0400 Subject: Apply mixin to correct class --- dist/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 2135b6270..5017c5fec 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3352,9 +3352,11 @@ button.close { float: left !important; } .navbar-right { + float: right !important; + } + .navbar-right .dropdown-menu { right: 0; left: auto; - float: right !important; } } -- cgit v1.2.3 From 1e1b5c737ba33c0e7a86634bcb3baedc70498884 Mon Sep 17 00:00:00 2001 From: Luca Wehrstedt Date: Tue, 13 Aug 2013 20:28:18 +0200 Subject: fixes #9406: proper border for justified btn-groups inside tables --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5017c5fec..f9226e258 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3872,6 +3872,7 @@ button.close { .btn-group-justified { display: table; width: 100%; + border-collapse: separate; table-layout: fixed; } -- cgit v1.2.3 From 1b3896fabfb2adef82d801132ef0c834c566fa0c Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Wed, 14 Aug 2013 11:39:38 -0400 Subject: Remove .navbar-collapse padding when not in mobile context --- dist/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5017c5fec..b001fec44 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3186,8 +3186,7 @@ button.close { @media (min-width: 768px) { .navbar-collapse { width: auto; - padding-top: 0; - padding-bottom: 0; + padding: 0; border-top: 0; box-shadow: none; } -- cgit v1.2.3 From ef60b0e5fbccbd16b964c1397a7f4cc4c9b51663 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Wed, 14 Aug 2013 13:03:00 -0400 Subject: Get rid of navbar-brand margin-right --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b001fec44..82ad64d57 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3228,7 +3228,6 @@ button.close { float: left; padding-top: 15px; padding-bottom: 15px; - margin-right: 7.5px; font-size: 18px; line-height: 20px; color: #777777; -- cgit v1.2.3 From 4d527ec316081113808f54a67a5a0d825071f480 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 14 Aug 2013 16:06:51 -0700 Subject: fixes #8702 until Normalize.css starts handling this --- dist/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 2c7c5bbc6..7ab8d2c45 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -316,6 +316,13 @@ textarea { line-height: inherit; } +button, +input, +select[multiple], +textarea { + background-image: none; +} + a { color: #428bca; text-decoration: none; -- cgit v1.2.3 From e684758b55dbfe1e18f3e3aa4d5eddcfaf1bd010 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 14 Aug 2013 18:20:28 -0700 Subject: fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios --- dist/css/bootstrap.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0e301335a..e98f84808 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1711,6 +1711,17 @@ textarea.form-control { margin-left: 10px; } +.radio[disabled], +.radio-inline[disabled], +.checkbox[disabled], +.checkbox-inline[disabled], +fieldset[disabled] .radio, +fieldset[disabled] .radio-inline, +fieldset[disabled] .checkbox, +fieldset[disabled] .checkbox-inline { + cursor: not-allowed; +} + .input-sm { height: 30px; padding: 5px 10px; @@ -1936,7 +1947,7 @@ textarea.input-lg { .btn[disabled], fieldset[disabled] .btn { pointer-events: none; - cursor: default; + cursor: not-allowed; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; -- cgit v1.2.3 From 2e8a146b61af1e197208ae2d52ee4bf4034352d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Aug 2013 21:24:48 -0700 Subject: remove gradients from dropdown menu items on hover/active (fixes #9473) --- dist/css/bootstrap.css | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e98f84808..fb34f1e95 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2300,7 +2300,7 @@ textarea.input-group-lg > .input-group-btn > .btn { .input-group-sm > .form-control, .input-group-sm > .input-group-addon, -.input-group-lg > .input-group-btn > .btn { +.input-group-sm > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; @@ -2310,14 +2310,14 @@ textarea.input-group-lg > .input-group-btn > .btn { select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, -select.input-group-lg > .input-group-btn > .btn { +select.input-group-sm > .input-group-btn > .btn { height: 30px; line-height: 30px; } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, -textarea.input-group-lg > .input-group-btn > .btn { +textarea.input-group-sm > .input-group-btn > .btn { height: auto; } @@ -2479,13 +2479,7 @@ textarea.input-group-lg > .input-group-btn > .btn { .dropdown-menu > li > a:focus { color: #ffffff; text-decoration: none; - background-color: #357ebd; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd)); - background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%); - background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); + background-color: #428bca; } .dropdown-menu > .active > a, @@ -2493,14 +2487,8 @@ textarea.input-group-lg > .input-group-btn > .btn { .dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #357ebd; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd)); - background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%); - background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); - background-repeat: repeat-x; + background-color: #428bca; outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); } .dropdown-menu > .disabled > a, -- cgit v1.2.3 From 9de788134fa40e37577a324c0d37377dc0369ec9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Aug 2013 21:32:23 -0700 Subject: refactor navbar file to better nest css and restore navbar-color to navbar text (fixes #9500) --- dist/css/bootstrap.css | 100 ++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 52 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index fb34f1e95..d3aa21703 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3196,6 +3196,12 @@ button.close { border-top: 0; box-shadow: none; } + .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } } @media (min-width: 768px) { @@ -3275,18 +3281,20 @@ button.close { margin-top: 4px; } +@media (min-width: 768px) { + .navbar-toggle { + position: relative; + top: auto; + left: auto; + display: none; + } +} + .navbar-nav { margin-right: -15px; margin-left: -15px; } -@media (min-width: 768px) { - .navbar-nav { - margin-right: 0; - margin-left: 0; - } -} - .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; @@ -3352,6 +3360,20 @@ button.close { } } +@media (min-width: 768px) { + .navbar-nav { + float: left; + margin: 0; + } + .navbar-nav > li { + float: left; + } + .navbar-nav > li > a { + padding-top: 15px; + padding-bottom: 15px; + } +} + @media (min-width: 768px) { .navbar-left { float: left !important; @@ -3457,6 +3479,25 @@ button.close { left: auto; } +.navbar-btn { + margin-top: 8px; +} + +.navbar-text { + float: left; + margin-top: 15px; + margin-bottom: 15px; + color: #777777; +} + +.navbar-link { + color: #777777; +} + +.navbar-link:hover { + color: #333333; +} + .navbar-inverse { background-color: #222222; border-color: #080808; @@ -3567,51 +3608,6 @@ button.close { } } -@media screen and (min-width: 768px) { - .navbar-nav { - float: left; - margin-top: 0; - margin-bottom: 0; - } - .navbar-nav > li { - float: left; - } - .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; - } - .navbar-toggle { - position: relative; - top: auto; - left: auto; - display: none; - } - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } -} - -.navbar-btn { - margin-top: 8px; -} - -.navbar-text { - float: left; - margin-top: 15px; - margin-bottom: 15px; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - .navbar-inverse .navbar-link { color: #999999; } -- cgit v1.2.3 From 0456e5e4b38e4b43a11da68d2e16187728dd05a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Aug 2013 23:02:58 -0700 Subject: fixes #9508: use navbar align mixin for buttons to get correct top/bottom spacing --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ec29240c8..08a115366 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3480,6 +3480,7 @@ button.close { .navbar-btn { margin-top: 8px; + margin-bottom: 8px; } .navbar-text { -- cgit v1.2.3 From 622fe05ff4c7f4110d5de8d4648505cfbf7349b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Aug 2013 23:06:37 -0700 Subject: fixes #9445: make img responsive mixin use display block, but provide option to pass custom value to it --- dist/css/bootstrap.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 08a115366..433361dd3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -344,12 +344,6 @@ img { vertical-align: middle; } -.img-responsive { - display: inline-block; - height: auto; - max-width: 100%; -} - .img-rounded { border-radius: 6px; } @@ -4567,7 +4561,7 @@ button.close { .thumbnail > img, .img-thumbnail { - display: inline-block; + display: block; height: auto; max-width: 100%; } @@ -4872,7 +4866,7 @@ a.list-group-item.active > .badge, .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: inline-block; + display: block; height: auto; max-width: 100%; line-height: 1; -- cgit v1.2.3 From 1b6a5bbca2595c60189ae07fc771fe3a7fc4a55f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 00:07:23 -0700 Subject: fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav --- dist/css/bootstrap.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 433361dd3..721f50a02 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3155,7 +3155,8 @@ button.close { .navbar-collapse { max-height: 340px; - padding: 5px 15px; + padding-right: 15px; + padding-left: 15px; overflow-x: visible; overflow-y: auto; border-top: 1px solid #e6e6e6; @@ -3186,7 +3187,8 @@ button.close { @media (min-width: 768px) { .navbar-collapse { width: auto; - padding: 0; + padding-right: 0; + padding-left: 0; border-top: 0; box-shadow: none; } @@ -3284,6 +3286,8 @@ button.close { } .navbar-nav { + padding-top: 7.5px; + padding-bottom: 7.5px; margin-right: -15px; margin-left: -15px; } @@ -3356,6 +3360,8 @@ button.close { @media (min-width: 768px) { .navbar-nav { float: left; + padding-top: 0; + padding-bottom: 0; margin: 0; } .navbar-nav > li { -- cgit v1.2.3 From fee3f1e733e80bd128736e1b9b403f49b701a6a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 00:46:18 -0700 Subject: fixes #9582: restore img-responsive as a class and move it's mixin to mixins.less --- dist/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 721f50a02..89f3481d4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -344,6 +344,12 @@ img { vertical-align: middle; } +.img-responsive { + display: block; + height: auto; + max-width: 100%; +} + .img-rounded { border-radius: 6px; } -- cgit v1.2.3 From 51f2c907e738a6dd531de36c52ddfc103f76b918 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 10:30:37 -0700 Subject: fixes #9607: restore bottom border on hover of nav tabs for proper display --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 89f3481d4..f6371cf13 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2956,7 +2956,7 @@ button.close { } .nav-tabs > li > a:hover { - border-color: #eeeeee; + border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > li.active > a, -- cgit v1.2.3 From 209d3af30188a6b426f0cf84d81b367b2f056e1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 11:31:26 -0700 Subject: Fixes #9617: consistent variation order, add .label-primary --- dist/css/bootstrap.css | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f6371cf13..bec2ddbce 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4662,13 +4662,13 @@ a.thumbnail:focus { background-color: #808080; } -.label-danger { - background-color: #d9534f; +.label-primary { + background-color: #428bca; } -.label-danger[href]:hover, -.label-danger[href]:focus { - background-color: #c9302c; +.label-primary[href]:hover, +.label-primary[href]:focus { + background-color: #3071a9; } .label-success { @@ -4680,6 +4680,15 @@ a.thumbnail:focus { background-color: #449d44; } +.label-info { + background-color: #5bc0de; +} + +.label-info[href]:hover, +.label-info[href]:focus { + background-color: #31b0d5; +} + .label-warning { background-color: #f0ad4e; } @@ -4689,13 +4698,13 @@ a.thumbnail:focus { background-color: #ec971f; } -.label-info { - background-color: #5bc0de; +.label-danger { + background-color: #d9534f; } -.label-info[href]:hover, -.label-info[href]:focus { - background-color: #31b0d5; +.label-danger[href]:hover, +.label-danger[href]:focus { + background-color: #c9302c; } .badge { -- cgit v1.2.3 From 06e6da09182f15f6eec6eaa68cb5e6c2af249a04 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 11:36:08 -0700 Subject: fixes #9596: proper dropup caret colors --- dist/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index bec2ddbce..11970380e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3634,15 +3634,15 @@ button.close { border-top-color: #fff; } -.btn-default .dropup .caret { +.dropup .btn-default .caret { border-bottom-color: #333333; } -.btn-primary .dropup .caret, -.btn-success .dropup .caret, -.btn-warning .dropup .caret, -.btn-danger .dropup .caret, -.btn-info .dropup .caret { +.dropup .btn-primary .caret, +.dropup .btn-success .caret, +.dropup .btn-warning .caret, +.dropup .btn-danger .caret, +.dropup .btn-info .caret { border-bottom-color: #fff; } -- cgit v1.2.3 From 5a0ba42a7becc00ea4c64806b714c5f351b9b96d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 11:47:56 -0700 Subject: fix up inverse navbar form styles --- dist/css/bootstrap.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 11970380e..23c2e503e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3400,6 +3400,8 @@ button.close { margin-left: -15px; border-top: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); } @media (min-width: 768px) { @@ -3439,6 +3441,8 @@ button.close { margin-right: 0; margin-left: 0; border: 0; + -webkit-box-shadow: none; + box-shadow: none; } } @@ -3560,8 +3564,9 @@ button.close { background-color: #ffffff; } -.navbar-inverse .navbar-collapse { - border-top-color: #101010; +.navbar-inverse .navbar-collapse, +.navbar-inverse .navbar-form { + border-color: #101010; } .navbar-inverse .navbar-nav > .open > a, -- cgit v1.2.3 From 2690a3dc3185e9666384cf6982354f0456473da7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 11:52:22 -0700 Subject: Add to #9578 and fix #9614: use cursor not-allowed on radios and checkboxes --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 23c2e503e..6db47a39b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1711,10 +1711,14 @@ textarea.form-control { margin-left: 10px; } +input[type="radio"][disabled], +input[type="checkbox"][disabled], .radio[disabled], .radio-inline[disabled], .checkbox[disabled], .checkbox-inline[disabled], +fieldset[disabled] input[type="radio"], +fieldset[disabled] input[type="checkbox"], fieldset[disabled] .radio, fieldset[disabled] .radio-inline, fieldset[disabled] .checkbox, -- cgit v1.2.3 From f9d2f9b6cd805c39217dcef0a11d4b721dc8e045 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:16:06 -0700 Subject: improve pagination's active state so it looks less like the active state and more like active nav items --- dist/css/bootstrap.css | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6db47a39b..251cb0ee5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3938,18 +3938,19 @@ button.close { .pagination > li > a, .pagination > li > span { + position: relative; float: left; padding: 6px 12px; + margin-left: -1px; line-height: 1.428571429; text-decoration: none; background-color: #ffffff; border: 1px solid #dddddd; - border-left-width: 0; } .pagination > li:first-child > a, .pagination > li:first-child > span { - border-left-width: 1px; + margin-left: 0; border-bottom-left-radius: 4px; border-top-left-radius: 4px; } @@ -3961,16 +3962,23 @@ button.close { } .pagination > li > a:hover, +.pagination > li > span:hover, .pagination > li > a:focus, -.pagination > .active > a, -.pagination > .active > span { - background-color: #f5f5f5; +.pagination > li > span:focus { + background-color: #eeeeee; } .pagination > .active > a, -.pagination > .active > span { - color: #999999; +.pagination > .active > span, +.pagination > .active > a:hover, +.pagination > .active > span:hover, +.pagination > .active > a:focus, +.pagination > .active > span:focus { + z-index: 2; + color: #ffffff; cursor: default; + background-color: #428bca; + border-color: #428bca; } .pagination > .disabled > span, @@ -3980,6 +3988,7 @@ button.close { color: #999999; cursor: not-allowed; background-color: #ffffff; + border-color: #dddddd; } .pagination-lg > li > a, @@ -4061,7 +4070,7 @@ button.close { .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #f5f5f5; + background-color: #428bca; } .pager .next > a, @@ -4833,22 +4842,22 @@ a.list-group-item.active > .badge, animation: progress-bar-stripes 2s linear infinite; } -.progress-bar-danger { - background-color: #d9534f; +.progress-bar-success { + background-color: #5cb85c; } -.progress-striped .progress-bar-danger { +.progress-striped .progress-bar-success { background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-bar-success { - background-color: #5cb85c; +.progress-bar-info { + background-color: #5bc0de; } -.progress-striped .progress-bar-success { +.progress-striped .progress-bar-info { background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4866,11 +4875,11 @@ a.list-group-item.active > .badge, background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-bar-info { - background-color: #5bc0de; +.progress-bar-danger { + background-color: #d9534f; } -.progress-striped .progress-bar-info { +.progress-striped .progress-bar-danger { background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -- cgit v1.2.3 From 0664b3f0da25a99c5e0d88fdc566480baeaf83aa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:29:45 -0700 Subject: fixes #9634: turn off overflow-y when the navbar is re-expanded into horizontal mode --- dist/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 251cb0ee5..5b80d802a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3208,6 +3208,9 @@ button.close { padding-bottom: 0; overflow: visible !important; } + .navbar-collapse.in { + overflow-y: visible; + } } @media (min-width: 768px) { -- cgit v1.2.3 From 418ca6c09b393096e80aef9dde0072943f6d7c63 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:40:21 -0700 Subject: fixes #9622: reset to inline-block for img-thumbnail, but keep block for .thumbnail > img --- dist/css/bootstrap.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5b80d802a..21cc26350 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4592,13 +4592,18 @@ button.close { display: block; } -.thumbnail > img, -.img-thumbnail { +.thumbnail > img { display: block; height: auto; max-width: 100%; } +.img-thumbnail { + display: inline-block; + height: auto; + max-width: 100%; +} + a.thumbnail:hover, a.thumbnail:focus { border-color: #428bca; -- cgit v1.2.3 From 2dbf2bb8fb388f84027ce33429e91c06c573acfc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:54:47 -0700 Subject: fixes #9629 --- dist/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 21cc26350..a3c124972 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3507,6 +3507,13 @@ button.close { color: #777777; } +@media (min-width: 768px) { + .navbar-text { + margin-right: 15px; + margin-left: 15px; + } +} + .navbar-link { color: #777777; } -- cgit v1.2.3 From 16d7265c9b2bf89bf24a6e133dffc9308614cd49 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 15:16:46 -0700 Subject: fixes #9647: ensure open dropdown toggles get .active styles --- dist/css/bootstrap.css | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c124972..399c33fcc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1967,7 +1967,8 @@ fieldset[disabled] .btn { .btn-default:hover, .btn-default:focus, .btn-default:active, -.btn-default.active { +.btn-default.active, +.open .dropdown-toggle.btn-default { color: #333333; background-color: #ebebeb; border-color: #adadad; @@ -2001,7 +2002,8 @@ fieldset[disabled] .btn-default.active { .btn-primary:hover, .btn-primary:focus, .btn-primary:active, -.btn-primary.active { +.btn-primary.active, +.open .dropdown-toggle.btn-primary { color: #ffffff; background-color: #3276b1; border-color: #285e8e; @@ -2035,7 +2037,8 @@ fieldset[disabled] .btn-primary.active { .btn-warning:hover, .btn-warning:focus, .btn-warning:active, -.btn-warning.active { +.btn-warning.active, +.open .dropdown-toggle.btn-warning { color: #ffffff; background-color: #ed9c28; border-color: #d58512; @@ -2069,7 +2072,8 @@ fieldset[disabled] .btn-warning.active { .btn-danger:hover, .btn-danger:focus, .btn-danger:active, -.btn-danger.active { +.btn-danger.active, +.open .dropdown-toggle.btn-danger { color: #ffffff; background-color: #d2322d; border-color: #ac2925; @@ -2103,7 +2107,8 @@ fieldset[disabled] .btn-danger.active { .btn-success:hover, .btn-success:focus, .btn-success:active, -.btn-success.active { +.btn-success.active, +.open .dropdown-toggle.btn-success { color: #ffffff; background-color: #47a447; border-color: #398439; @@ -2137,7 +2142,8 @@ fieldset[disabled] .btn-success.active { .btn-info:hover, .btn-info:focus, .btn-info:active, -.btn-info.active { +.btn-info.active, +.open .dropdown-toggle.btn-info { color: #ffffff; background-color: #39b3d7; border-color: #269abc; -- cgit v1.2.3 From 7cd35f0cb6d17d6117264f71f175a9e5b0b09580 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 16:17:44 -0700 Subject: nuke bg image on active/open for buttons for when we add gradients --- dist/css/bootstrap.css | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 399c33fcc..37d4c9366 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1942,6 +1942,7 @@ textarea.input-lg { .btn:active, .btn.active { + background-image: none; outline: 0; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); @@ -1974,6 +1975,12 @@ fieldset[disabled] .btn { border-color: #adadad; } +.btn-default:active, +.btn-default.active, +.open .dropdown-toggle.btn-default { + background-image: none; +} + .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, @@ -2009,6 +2016,12 @@ fieldset[disabled] .btn-default.active { border-color: #285e8e; } +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + background-image: none; +} + .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, @@ -2044,6 +2057,12 @@ fieldset[disabled] .btn-primary.active { border-color: #d58512; } +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + background-image: none; +} + .btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, @@ -2079,6 +2098,12 @@ fieldset[disabled] .btn-warning.active { border-color: #ac2925; } +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + background-image: none; +} + .btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, @@ -2114,6 +2139,12 @@ fieldset[disabled] .btn-danger.active { border-color: #398439; } +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + background-image: none; +} + .btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, @@ -2149,6 +2180,12 @@ fieldset[disabled] .btn-success.active { border-color: #269abc; } +.btn-info:active, +.btn-info.active, +.open .dropdown-toggle.btn-info { + background-image: none; +} + .btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, -- cgit v1.2.3 From fc88bcf0d15417c05c6d37027579bb5e3cb34236 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 18:58:02 -0700 Subject: fixes #9655: scrope list group styles in panels to immediate children only --- dist/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 37d4c9366..01626819a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2688,20 +2688,20 @@ a.list-group-item:focus { padding: 15px; } -.panel .list-group { +.panel > .list-group { margin-bottom: 0; } -.panel .list-group .list-group-item { +.panel > .list-group .list-group-item { border-width: 1px 0; } -.panel .list-group .list-group-item:first-child { +.panel > .list-group .list-group-item:first-child { border-top-right-radius: 0; border-top-left-radius: 0; } -.panel .list-group .list-group-item:last-child { +.panel > .list-group .list-group-item:last-child { border-bottom: 0; } -- cgit v1.2.3 From b0a66e60c1ebf13e6bfdb9d844e9ca6d3cd88251 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 20:25:20 -0700 Subject: Fixes #9663: Add offset overrides for medium and large grid tiers --- dist/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 01626819a..52f8b8575 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1178,6 +1178,9 @@ pre code { .col-md-pull-11 { right: 91.66666666666666%; } + .col-md-offset-0 { + margin-left: 0; + } .col-md-offset-1 { margin-left: 8.333333333333332%; } @@ -1332,6 +1335,9 @@ pre code { .col-lg-pull-11 { right: 91.66666666666666%; } + .col-lg-offset-0 { + margin-left: 0; + } .col-lg-offset-1 { margin-left: 8.333333333333332%; } -- cgit v1.2.3 From 111bdc4e93ffd61b08736e7ec87699dc4a8d3ca2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 20:31:11 -0700 Subject: fixes #9663: second part, reset pushes and pulls in md and lg grid tiers --- dist/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 52f8b8575..958e9302f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1112,6 +1112,9 @@ pre code { .col-md-12 { width: 100%; } + .col-md-push-0 { + left: auto; + } .col-md-push-1 { left: 8.333333333333332%; } @@ -1145,6 +1148,9 @@ pre code { .col-md-push-11 { left: 91.66666666666666%; } + .col-md-pull-0 { + right: auto; + } .col-md-pull-1 { right: 8.333333333333332%; } @@ -1269,6 +1275,9 @@ pre code { .col-lg-12 { width: 100%; } + .col-lg-push-0 { + left: auto; + } .col-lg-push-1 { left: 8.333333333333332%; } @@ -1302,6 +1311,9 @@ pre code { .col-lg-push-11 { left: 91.66666666666666%; } + .col-lg-pull-0 { + right: auto; + } .col-lg-pull-1 { right: 8.333333333333332%; } -- cgit v1.2.3 From 771ac3207e1f5c0a624680a11e8245da13dcac12 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:08:29 -0700 Subject: xs button is xs-er (fixes #9695) --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 958e9302f..c07134015 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2277,7 +2277,7 @@ fieldset[disabled] .btn-link:focus { } .btn-xs { - padding: 3px 5px; + padding: 1px 5px; } .btn-block { @@ -3838,7 +3838,7 @@ button.close { .btn-group-xs > .btn { padding: 5px 10px; - padding: 3px 5px; + padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px; -- cgit v1.2.3 From ed4316d9b28e532d0bdbe3b5ddd23006ea7f7f9b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:16:32 -0700 Subject: fixes #9642: open dropdown nav items get proper styling --- dist/css/bootstrap.css | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c07134015..9d1c8daed 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2978,21 +2978,13 @@ button.close { background-color: transparent; } -.nav.open > a, -.nav.open > a:hover, -.nav.open > a:focus { - color: #ffffff; - background-color: #428bca; +.nav .open > a, +.nav .open > a:hover, +.nav .open > a:focus { + background-color: #eeeeee; border-color: #428bca; } -.nav.open > a .caret, -.nav.open > a:hover .caret, -.nav.open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - .nav .nav-divider { height: 1px; margin: 9px 0; -- cgit v1.2.3 From e5f38207e0f8a356728e78f91a83b945934fd71d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:34:30 -0700 Subject: fixed navbar static top borders --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9d1c8daed..9bfc19b20 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3266,9 +3266,12 @@ button.close { } } +.navbar-static-top { + border-width: 0 0 1px; +} + @media (min-width: 768px) { .navbar-static-top { - border-width: 0 0 1px; border-radius: 0; } } -- cgit v1.2.3 From c13772d5f7584a83476a12fec379d8424ea312d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 12:38:41 -0700 Subject: switch to margin on navbar-nav to avoid stacking negative space reported in #9705 --- dist/css/bootstrap.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9bfc19b20..b161caada 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3355,10 +3355,7 @@ button.close { } .navbar-nav { - padding-top: 7.5px; - padding-bottom: 7.5px; - margin-right: -15px; - margin-left: -15px; + margin: 7.5px -15px; } .navbar-nav > li > a { @@ -3429,8 +3426,6 @@ button.close { @media (min-width: 768px) { .navbar-nav { float: left; - padding-top: 0; - padding-bottom: 0; margin: 0; } .navbar-nav > li { -- cgit v1.2.3 From e6f185acad5741fcbe0b3305e0660e5e6ea4f41c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 14:01:32 -0700 Subject: Justified nav now responsive; example updated accordingly (fixes #9708) --- dist/css/bootstrap.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b161caada..515c9cd22 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3032,15 +3032,20 @@ button.close { } .nav-tabs.nav-justified > li { - display: table-cell; float: none; - width: 1%; } .nav-tabs.nav-justified > li > a { text-align: center; } +@media (min-width: 768px) { + .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } +} + .nav-tabs.nav-justified > li > a { margin-right: 0; border-bottom: 1px solid #dddddd; @@ -3083,15 +3088,20 @@ button.close { } .nav-justified > li { - display: table-cell; float: none; - width: 1%; } .nav-justified > li > a { text-align: center; } +@media (min-width: 768px) { + .nav-justified > li { + display: table-cell; + width: 1%; + } +} + .nav-tabs-justified { border-bottom: 0; } -- cgit v1.2.3 From f459d76e388b1d73b8b0065f8fbaf573f7eaed32 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 15:07:45 -0700 Subject: fixes #9475 --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 515c9cd22..b44253ee2 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3231,7 +3231,6 @@ button.close { padding-right: 15px; padding-left: 15px; overflow-x: visible; - overflow-y: auto; border-top: 1px solid #e6e6e6; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; @@ -3257,6 +3256,10 @@ button.close { clear: both; } +.navbar-collapse.in { + overflow-y: auto; +} + @media (min-width: 768px) { .navbar-collapse { width: auto; -- cgit v1.2.3 From e4bb388bc91790d2b0a0ff0be1f329945adcc3ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 15:16:03 -0700 Subject: Make negative margins on rows the default, not just in containers, and add padding to body to compensate --- dist/css/bootstrap.css | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b44253ee2..c153c62f7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -300,6 +300,8 @@ html { } body { + padding-right: 15px; + padding-left: 15px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.428571429; @@ -757,6 +759,11 @@ pre code { clear: both; } +.row { + margin-right: -15px; + margin-left: -15px; +} + .row:before, .row:after { display: table; @@ -777,18 +784,6 @@ pre code { clear: both; } -@media (min-width: 768px) { - .container .row { - margin-right: -15px; - margin-left: -15px; - } -} - -.row .row { - margin-right: -15px; - margin-left: -15px; -} - .col-xs-1, .col-xs-2, .col-xs-3, @@ -1888,6 +1883,11 @@ textarea.input-lg { padding-top: 6px; } +.form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; +} + .form-horizontal .form-group:before, .form-horizontal .form-group:after { display: table; @@ -1908,18 +1908,6 @@ textarea.input-lg { clear: both; } -@media (min-width: 768px) { - .container .form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; - } -} - -.form-horizontal .form-group .row { - margin-right: -15px; - margin-left: -15px; -} - @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; -- cgit v1.2.3 From cd0df1d21aaed8751b8c29aab3b30ff027aac89d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 22:37:02 -0700 Subject: fixes #9436 more: put padding on containers, not the body because full width elements --- dist/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c153c62f7..2b3c8fb9e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -300,8 +300,6 @@ html { } body { - padding-right: 15px; - padding-left: 15px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.428571429; @@ -735,6 +733,8 @@ pre code { } .container { + padding-right: 15px; + padding-left: 15px; margin-right: auto; margin-left: auto; } @@ -902,7 +902,7 @@ pre code { @media (min-width: 768px) { .container { - max-width: 720px; + max-width: 750px; } .col-sm-1, .col-sm-2, @@ -1056,7 +1056,7 @@ pre code { @media (min-width: 992px) { .container { - max-width: 940px; + max-width: 970px; } .col-md-1, .col-md-2, @@ -1219,7 +1219,7 @@ pre code { @media (min-width: 1200px) { .container { - max-width: 1140px; + max-width: 1170px; } .col-lg-1, .col-lg-2, -- cgit v1.2.3 From ab700d753c5dd77d278c7ee284b5d4c8250543c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:07:21 -0700 Subject: fix #9743: pager hover background should be light gray --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 2b3c8fb9e..2639bb9a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4132,7 +4132,7 @@ button.close { .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #428bca; + background-color: #eeeeee; } .pager .next > a, -- cgit v1.2.3 From 82f6f08f89ab8b86aa2d5b175493e24d1f4329cb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:18:10 -0700 Subject: Fixes #9552: Downsize and use whole numbers for panel title to prevent odd 1px bug --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 2639bb9a9..7f7fae1aa 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2726,7 +2726,7 @@ a.list-group-item:focus { .panel-title { margin-top: 0; margin-bottom: 0; - font-size: 17.5px; + font-size: 16px; } .panel-title > a { -- cgit v1.2.3 From 0c70744ea22126b6224bde75b4ccb6068941e38f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:33:53 -0700 Subject: fixes #9538: prevent Firefox rendering bug via some border-fu --- dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7f7fae1aa..ae1ac035a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn { vertical-align: middle; border-top: 4px solid #000000; border-right: 4px solid transparent; + border-bottom: 0 dotted; border-left: 4px solid transparent; content: ""; } @@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0; + border-top: 0 dotted; border-bottom: 4px solid #000000; content: ""; } -- cgit v1.2.3 From 6ca32589b59434574a9e9ed6cb12718b0234754e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 14:15:33 -0700 Subject: 2px border on thead th elements for just a tad more separation --- dist/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ae1ac035a..c290d1221 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1408,6 +1408,7 @@ th { .table thead > tr > th { vertical-align: bottom; + border-bottom: 2px solid #dddddd; } .table caption + thead tr:first-child th, @@ -1449,6 +1450,11 @@ th { border: 1px solid #dddddd; } +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} + .table-striped > tbody > tr:nth-child(odd) > td, .table-striped > tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; -- cgit v1.2.3 From 663673438845b0bdb4f951ece7c6eabb2d51d065 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 15:46:42 -0700 Subject: Fixes #9752: clear floats in .panel-body --- dist/css/bootstrap.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c290d1221..dd76c038c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2701,6 +2701,26 @@ a.list-group-item:focus { padding: 15px; } +.panel-body:before, +.panel-body:after { + display: table; + content: " "; +} + +.panel-body:after { + clear: both; +} + +.panel-body:before, +.panel-body:after { + display: table; + content: " "; +} + +.panel-body:after { + clear: both; +} + .panel > .list-group { margin-bottom: 0; } -- cgit v1.2.3 From e58721995879da2e866f27d389dfa9ed9da4d0b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 17:26:52 -0700 Subject: Fix navbar brand alignment by removing header padding when above 768px --- dist/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index dd76c038c..b7fc3af70 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3238,6 +3238,9 @@ button.close { @media (min-width: 768px) { .navbar-header { float: left; + padding-right: 0; + padding-left: 0; + margin-right: 15px; } } -- cgit v1.2.3