From 1be0b57d34c4712ba747ccb0e917acef2117dc13 Mon Sep 17 00:00:00 2001 From: Rob Fletcher Date: Mon, 17 Mar 2014 14:36:58 +0000 Subject: Fix vertical alignment of temporal inputs on iOS Fixes #13098 Closes #13099 --- dist/css/bootstrap.css | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4a7a28fb0..c4870da5b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2371,14 +2371,23 @@ textarea.form-control { input[type="search"] { -webkit-appearance: none; } -input[type="date"] { +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { line-height: 34px; line-height: 1.42857143 \0; } -input[type="date"].input-sm { +input[type="date"].input-sm, +input[type="time"].input-sm, +input[type="datetime-local"].input-sm, +input[type="month"].input-sm { line-height: 30px; } -input[type="date"].input-lg { +input[type="date"].input-lg, +input[type="time"].input-lg, +input[type="datetime-local"].input-lg, +input[type="month"].input-lg { line-height: 46px; } .form-group { -- cgit v1.2.3 From 21084192b642f7a7340a58c88025771ea281f48d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 19:08:05 -0700 Subject: Fixes #13079: Scope .open class in button variant mixin to immediate children --- dist/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c4870da5b..cc058b732 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2721,14 +2721,14 @@ fieldset[disabled] .btn { .btn-default:focus, .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad; } .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { background-image: none; } .btn-default.disabled, @@ -2762,14 +2762,14 @@ fieldset[disabled] .btn-default.active { .btn-primary:focus, .btn-primary:active, .btn-primary.active, -.open .dropdown-toggle.btn-primary { +.open > .dropdown-toggle.btn-primary { color: #fff; background-color: #3071a9; border-color: #285e8e; } .btn-primary:active, .btn-primary.active, -.open .dropdown-toggle.btn-primary { +.open > .dropdown-toggle.btn-primary { background-image: none; } .btn-primary.disabled, @@ -2803,14 +2803,14 @@ fieldset[disabled] .btn-primary.active { .btn-success:focus, .btn-success:active, .btn-success.active, -.open .dropdown-toggle.btn-success { +.open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439; } .btn-success:active, .btn-success.active, -.open .dropdown-toggle.btn-success { +.open > .dropdown-toggle.btn-success { background-image: none; } .btn-success.disabled, @@ -2844,14 +2844,14 @@ fieldset[disabled] .btn-success.active { .btn-info:focus, .btn-info:active, .btn-info.active, -.open .dropdown-toggle.btn-info { +.open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc; } .btn-info:active, .btn-info.active, -.open .dropdown-toggle.btn-info { +.open > .dropdown-toggle.btn-info { background-image: none; } .btn-info.disabled, @@ -2885,14 +2885,14 @@ fieldset[disabled] .btn-info.active { .btn-warning:focus, .btn-warning:active, .btn-warning.active, -.open .dropdown-toggle.btn-warning { +.open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512; } .btn-warning:active, .btn-warning.active, -.open .dropdown-toggle.btn-warning { +.open > .dropdown-toggle.btn-warning { background-image: none; } .btn-warning.disabled, @@ -2926,14 +2926,14 @@ fieldset[disabled] .btn-warning.active { .btn-danger:focus, .btn-danger:active, .btn-danger.active, -.open .dropdown-toggle.btn-danger { +.open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925; } .btn-danger:active, .btn-danger.active, -.open .dropdown-toggle.btn-danger { +.open > .dropdown-toggle.btn-danger { background-image: none; } .btn-danger.disabled, -- cgit v1.2.3 From 6f6bce5944bd0e6ab36ab6b39339f381d8a80b2a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 19:26:41 -0700 Subject: Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text --- 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 cc058b732..ed8087b2f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2285,6 +2285,7 @@ legend { } label { display: inline-block; + max-width: 100%; margin-bottom: 5px; font-weight: bold; } -- cgit v1.2.3 From 6951b48e65f6c10e8d29e1ea2853e109943f3c9c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 20:01:46 -0700 Subject: grunt --- dist/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ed8087b2f..0b67f9f5f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2136,6 +2136,7 @@ table th[class*="col-"] { .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, +.table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { background-color: #e8e8e8; } @@ -2156,6 +2157,7 @@ table th[class*="col-"] { .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, +.table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6; } @@ -2176,6 +2178,7 @@ table th[class*="col-"] { .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, +.table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { background-color: #c4e3f3; } @@ -2196,6 +2199,7 @@ table th[class*="col-"] { .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, +.table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc; } @@ -2216,6 +2220,7 @@ table th[class*="col-"] { .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, +.table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc; } -- cgit v1.2.3 From b4f4c7b16f26ca1cf9fabf4bca4447e1cb2a688e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 20:02:56 -0700 Subject: Fixes #13037: add text-align: left; to prevent alignment change in dropdowns --- 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 0b67f9f5f..590598b44 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3088,6 +3088,7 @@ tbody.collapse.in { padding: 5px 0; margin: 2px 0 0; font-size: 14px; + text-align: left; list-style: none; background-color: #fff; -webkit-background-clip: padding-box; -- cgit v1.2.3 From acf57073231ebd521a87f523de6c51930d3c1ff4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 20:07:54 -0700 Subject: Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them --- 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 590598b44..e745d17c3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2492,6 +2492,7 @@ select[multiple].input-lg { position: absolute; top: 25px; right: 0; + z-index: 2; display: block; width: 34px; height: 34px; -- cgit v1.2.3 From 10586bf040655919260344695aeeb9e7977ed70c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Mar 2014 08:01:21 +0200 Subject: Run `grunt`. --- 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 e745d17c3..d4cc55cfc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4,7 +4,7 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ html { font-family: sans-serif; -webkit-text-size-adjust: 100%; -- cgit v1.2.3 From 4c2626fecb60f7f31f248ac10597294f2cd2471b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 3 Apr 2014 10:53:20 +0300 Subject: Run `grunt`. --- 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 d4cc55cfc..525951470 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5399,7 +5399,7 @@ button.close { } .tooltip { position: absolute; - z-index: 1030; + z-index: 1070; display: block; font-size: 12px; line-height: 1.4; @@ -5499,7 +5499,7 @@ button.close { position: absolute; top: 0; left: 0; - z-index: 1010; + z-index: 1060; display: none; max-width: 276px; padding: 1px; -- cgit v1.2.3 From bfb99413eefbbe2e8fbb1e477cbfa63ea7d36140 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Apr 2014 20:49:22 -0700 Subject: grunt dist --- dist/css/bootstrap.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 525951470..847b1ed40 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5717,17 +5717,18 @@ button.close { .carousel-control .icon-prev, .carousel-control .glyphicon-chevron-left { left: 50%; + margin-left: -10px; } .carousel-control .icon-next, .carousel-control .glyphicon-chevron-right { right: 50%; + margin-right: -10px; } .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; height: 20px; margin-top: -10px; - margin-left: -10px; font-family: serif; } .carousel-control .icon-prev:before { @@ -5788,9 +5789,16 @@ button.close { width: 30px; height: 30px; margin-top: -15px; - margin-left: -15px; font-size: 30px; } + .carousel-control .glyphicon-chevron-left, + .carousel-control .icon-prev { + margin-left: -15px; + } + .carousel-control .glyphicon-chevron-right, + .carousel-control .icon-next { + margin-right: -15px; + } .carousel-caption { right: 20%; left: 20%; -- cgit v1.2.3 From 485b7d09409fec261f8f15cf018c9166fbd0d4d2 Mon Sep 17 00:00:00 2001 From: Daijiro Wachi Date: Sat, 26 Apr 2014 02:04:07 +0900 Subject: Fixed navbar radius of example at docs --- 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 847b1ed40..146b1a0e4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5296,10 +5296,10 @@ button.close { -webkit-transition: -webkit-transform .3s ease-out; -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - -o-transform: translate(0, -25%); - transform: translate(0, -25%); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -- cgit v1.2.3 From b2173572527ece62c0e0055ebbc87e986ab1f844 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Apr 2014 19:35:47 -0700 Subject: grunt dist --- 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 847b1ed40..d0ea65ef9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1103,7 +1103,7 @@ p { .lead { margin-bottom: 20px; font-size: 16px; - font-weight: 200; + font-weight: 300; line-height: 1.4; } @media (min-width: 768px) { -- cgit v1.2.3 From 108b7c390efda6f9d56fb2749374a7999956b1a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Apr 2014 19:47:56 -0700 Subject: grunt dist --- 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 847b1ed40..40c18d925 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2587,6 +2587,9 @@ select[multiple].input-lg { .has-error .form-control-feedback { color: #a94442; } +.has-feedback label.sr-only ~ .form-control-feedback { + top: 0; +} .form-control-static { margin-bottom: 0; } -- cgit v1.2.3 From cb2ef1eff4cbfad8998f94adf7f61cdf574ca100 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 8 May 2014 16:35:03 -0700 Subject: grunt dist --- 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 ae4af3bd5..5e343114f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5299,10 +5299,10 @@ button.close { -webkit-transition: -webkit-transform .3s ease-out; -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - -o-transform: translate(0, -25%); - transform: translate(0, -25%); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -- cgit v1.2.3 From f5513fd30ef16228869b1ec3473217dab63f2c29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 May 2014 19:47:53 -0700 Subject: nuke rtl --- 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 5e343114f..9501986c9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3369,6 +3369,7 @@ tbody.collapse.in { [data-toggle="buttons"] > .btn > input[type="checkbox"] { position: absolute; z-index: -1; + filter: alpha(opacity=0); opacity: 0; } .input-group { -- cgit v1.2.3 From d4c72487490169c11e4c0166d31cbb40b105c216 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 May 2014 20:26:01 -0700 Subject: grunt dist --- 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 9501986c9..b9c606f79 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3365,6 +3365,9 @@ tbody.collapse.in { .btn-group-justified > .btn-group .btn { width: 100%; } +.btn-group-justified > .btn-group .dropdown-menu { + left: auto; +} [data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { position: absolute; -- cgit v1.2.3 From fab9ab8fe9b51ebc88872482556df3f793e5ac4a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 May 2014 18:42:21 -0700 Subject: Reset the padding on radio/checkbox labels in form-inline --- 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 b9c606f79..b172acc5b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2629,11 +2629,14 @@ select[multiple].input-lg { .form-inline .radio, .form-inline .checkbox { display: inline-block; - padding-left: 0; margin-top: 0; margin-bottom: 0; vertical-align: middle; } + .form-inline .radio label, + .form-inline .checkbox label { + padding-left: 0; + } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { float: none; @@ -3971,11 +3974,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-form .radio, .navbar-form .checkbox { display: inline-block; - padding-left: 0; margin-top: 0; margin-bottom: 0; vertical-align: middle; } + .navbar-form .radio label, + .navbar-form .checkbox label { + padding-left: 0; + } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { float: none; -- cgit v1.2.3 From 5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805 Mon Sep 17 00:00:00 2001 From: Ben Zumhagen Date: Tue, 3 Jun 2014 22:48:36 -0400 Subject: Resolves Issue #13689 Doing this the right way this time. Hiding .panel-footer top border when preceeded by a .list-group. This should resolve the "double border" issue. --- 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 b172acc5b..138bd4304 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4993,6 +4993,9 @@ a.list-group-item-danger.active:focus { .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } +.list-group + .panel-footer { + border-top-width: 0; +} .panel > .table, .panel > .table-responsive > .table { margin-bottom: 0; -- cgit v1.2.3 From 739bf379a93a2a396e23f0423167b3552eb88191 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 5 Jun 2014 13:31:39 -0700 Subject: set not-allowed cursor on disabled radio+checkbox labels; fixes #13281 [skip validator] [skip sauce] --- dist/css/bootstrap.css | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b172acc5b..87855926d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2440,18 +2440,24 @@ input[type="month"].input-lg { } input[type="radio"][disabled], input[type="checkbox"][disabled], -.radio[disabled], -.radio-inline[disabled], -.checkbox[disabled], -.checkbox-inline[disabled], +input[type="radio"].disabled, +input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], -fieldset[disabled] input[type="checkbox"], -fieldset[disabled] .radio, +fieldset[disabled] input[type="checkbox"] { + cursor: not-allowed; +} +.radio-inline.disabled, +.checkbox-inline.disabled, fieldset[disabled] .radio-inline, -fieldset[disabled] .checkbox, fieldset[disabled] .checkbox-inline { cursor: not-allowed; } +.radio.disabled label, +.checkbox.disabled label, +fieldset[disabled] .radio label, +fieldset[disabled] .checkbox label { + cursor: not-allowed; +} .input-sm { height: 30px; padding: 5px 10px; -- cgit v1.2.3 From 1e3b93804fa88d247d8708529fb44b28d73fd91f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 11:18:59 -0700 Subject: grunt --- 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 87855926d..ad2215659 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3822,6 +3822,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { right: 0; left: 0; z-index: 1030; + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } @media (min-width: 768px) { .navbar-fixed-top, @@ -5315,16 +5318,14 @@ button.close { -webkit-transition: -webkit-transform .3s ease-out; -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - -o-transform: translate(0, -25%); - transform: translate(0, -25%); + -webkit-transform: translate3d(0, -25%, 0); + -o-transform: translate3d(0, -25%, 0); + transform: translate3d(0, -25%, 0); } .modal.in .modal-dialog { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - -o-transform: translate(0, 0); - transform: translate(0, 0); + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } .modal-dialog { position: relative; @@ -5910,6 +5911,9 @@ button.close { } .affix { position: fixed; + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } @-ms-viewport { width: device-width; -- cgit v1.2.3 From 5cd72ce23058b47a739c7e2005ab5c3d4e28ff30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 13:55:40 -0700 Subject: grunt --- 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 ad2215659..28a04c5eb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5133,7 +5133,7 @@ a.list-group-item-danger.active:focus { .panel-group .panel-heading { border-bottom: 0; } -.panel-group .panel-heading + .panel-collapse .panel-body { +.panel-group .panel-heading + .panel-collapse > .panel-body { border-top: 1px solid #ddd; } .panel-group .panel-footer { -- cgit v1.2.3 From 5dbfdd47c57a10cc8e97e74635a4197d31c24f7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 14:08:06 -0700 Subject: fixes #13375 --- 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 8f378a5aa..c7c0ba80e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5006,7 +5006,8 @@ a.list-group-item-danger.active:focus { border-top-width: 0; } .panel > .table, -.panel > .table-responsive > .table { +.panel > .table-responsive > .table, +.panel > .panel-collapse > .table { margin-bottom: 0; } .panel > .table:first-child, -- cgit v1.2.3 From 85cde774b9c8a6970d9e29fc0458c53d09b628a1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 16:54:05 -0700 Subject: remove max-width: 100%; from table and place it on .table --- 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 c7c0ba80e..002ac92b3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -890,7 +890,7 @@ th { box-sizing: border-box; } html { - font-size: 62.5%; + font-size: 10px; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } @@ -2038,7 +2038,6 @@ pre code { } } table { - max-width: 100%; background-color: transparent; } th { @@ -2046,6 +2045,7 @@ th { } .table { width: 100%; + max-width: 100%; margin-bottom: 20px; } .table > thead > tr > th, -- cgit v1.2.3 From 8d9ef8f0a14c7bf95a3d7aa2eb7d15e42a2c9f38 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 23:02:16 -0700 Subject: Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients --- dist/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 002ac92b3..2eb04e391 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5702,10 +5702,9 @@ button.close { opacity: .5; } .carousel-control.left { - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%)); + background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001))); - background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); background-repeat: repeat-x; @@ -5713,10 +5712,9 @@ button.close { .carousel-control.right { right: 0; left: auto; - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%)); + background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5))); - background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); background-repeat: repeat-x; -- cgit v1.2.3 From 4aca4cf8661ab6e17ffd58820679a081db80ceaa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 00:26:20 -0700 Subject: grunt for table change --- 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 2eb04e391..71f7e5509 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2228,7 +2228,7 @@ table th[class*="col-"] { .table-responsive { width: 100%; margin-bottom: 15px; - overflow-x: scroll; + overflow-x: auto; overflow-y: hidden; -webkit-overflow-scrolling: touch; -ms-overflow-style: -ms-autohiding-scrollbar; -- cgit v1.2.3 From c0e82accadea85094ef2f8b208975c449130f33f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 20:17:22 -0700 Subject: grunt --- dist/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 71f7e5509..1701df553 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5313,8 +5313,7 @@ button.close { left: 0; z-index: 1050; display: none; - overflow: auto; - overflow-y: scroll; + overflow: hidden; -webkit-overflow-scrolling: touch; outline: 0; } @@ -5331,6 +5330,10 @@ button.close { -o-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; +} .modal-dialog { position: relative; width: auto; -- cgit v1.2.3 From 631e04b6fc1cc643610684fe3d3c683ee486a9fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 20:50:58 -0700 Subject: Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 --- 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 1701df553..ae3adc61b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2401,6 +2401,7 @@ input[type="month"].input-lg { } .radio, .checkbox { + position: relative; display: block; min-height: 20px; margin-top: 10px; @@ -2417,7 +2418,8 @@ input[type="month"].input-lg { .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { - float: left; + position: absolute; + margin-top: 4px \9; margin-left: -20px; } .radio + .radio, -- cgit v1.2.3 From dcbe484a09531da4ecc80fd2991a9910fb6a64ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 21:20:34 -0700 Subject: New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. --- 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 ae3adc61b..c4998c7c7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1135,6 +1135,9 @@ mark, .text-justify { text-align: justify; } +.text-nowrap { + white-space: nowrap; +} .text-muted { color: #999; } -- cgit v1.2.3 From 7bcd78847ffe3c85d024f097e7102667e3c79604 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 22:51:17 -0700 Subject: grunt --- dist/css/bootstrap.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c4998c7c7..390c13d0a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5162,6 +5162,10 @@ a.list-group-item-danger.active:focus { .panel-default > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ddd; } +.panel-default > .panel-heading .badge { + color: #f5f5f5; + background-color: #333; +} .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ddd; } @@ -5176,6 +5180,10 @@ a.list-group-item-danger.active:focus { .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #428bca; } +.panel-primary > .panel-heading .badge { + color: #428bca; + background-color: #fff; +} .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #428bca; } @@ -5190,6 +5198,10 @@ a.list-group-item-danger.active:focus { .panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #d6e9c6; } +.panel-success > .panel-heading .badge { + color: #dff0d8; + background-color: #3c763d; +} .panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #d6e9c6; } @@ -5204,6 +5216,10 @@ a.list-group-item-danger.active:focus { .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #bce8f1; } +.panel-info > .panel-heading .badge { + color: #d9edf7; + background-color: #31708f; +} .panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #bce8f1; } @@ -5218,6 +5234,10 @@ a.list-group-item-danger.active:focus { .panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #faebcc; } +.panel-warning > .panel-heading .badge { + color: #fcf8e3; + background-color: #8a6d3b; +} .panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #faebcc; } @@ -5232,6 +5252,10 @@ a.list-group-item-danger.active:focus { .panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ebccd1; } +.panel-danger > .panel-heading .badge { + color: #f2dede; + background-color: #a94442; +} .panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ebccd1; } -- cgit v1.2.3 From 5c1357b3e96bfa87994251ee97bef6e7315b6b83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 22:58:21 -0700 Subject: grunt --- dist/css/bootstrap.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 390c13d0a..425c26c3b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1138,6 +1138,15 @@ mark, .text-nowrap { white-space: nowrap; } +.text-lowercase { + text-transform: lowercase; +} +.text-uppercase { + text-transform: uppercase; +} +.text-capitalize { + text-transform: capitalize; +} .text-muted { color: #999; } -- cgit v1.2.3 From f09d6b7a9827452d259b4daafbe3f8341b557776 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 23:15:09 -0700 Subject: grunt --- 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 425c26c3b..6bd664017 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1357,6 +1357,12 @@ kbd { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); } +kbd kbd { + padding: 0; + font-size: 100%; + -webkit-box-shadow: none; + box-shadow: none; +} pre { display: block; padding: 9.5px; -- cgit v1.2.3 From 8bee6549ade7103b7de805ae92ccff50102008b0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 17 Jun 2014 18:23:14 -0700 Subject: grunt dist --- 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 6bd664017..3d2dae1c5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4612,10 +4612,12 @@ a.thumbnail.active { .alert > p + p { margin-top: 5px; } -.alert-dismissable { +.alert-dismissable, +.alert-dismissible { padding-right: 35px; } -.alert-dismissable .close { +.alert-dismissable .close, +.alert-dismissible .close { position: relative; top: -2px; right: -21px; -- cgit v1.2.3 From fdf174e498d8fbd9a73c45ccd805099a25e790f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 15:46:38 -0700 Subject: grunt dist --- dist/css/bootstrap.css | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 3d2dae1c5..894605714 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1025,7 +1025,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #999; + color: #777; } h1, .h1, @@ -1148,7 +1148,7 @@ mark, text-transform: capitalize; } .text-muted { - color: #999; + color: #777; } .text-primary { color: #428bca; @@ -1272,7 +1272,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #999; + border-bottom: 1px dotted #777; } .initialism { font-size: 90%; @@ -1295,7 +1295,7 @@ blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; - color: #999; + color: #777; } blockquote footer:before, blockquote small:before, @@ -2373,14 +2373,14 @@ output { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } .form-control::-moz-placeholder { - color: #999; + color: #777; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999; + color: #777; } .form-control::-webkit-input-placeholder { - color: #999; + color: #777; } .form-control[disabled], .form-control[readonly], @@ -3027,7 +3027,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #999; + color: #777; text-decoration: none; } .btn-lg, @@ -3168,7 +3168,7 @@ tbody.collapse.in { .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999; + color: #777; } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { @@ -3197,7 +3197,7 @@ tbody.collapse.in { padding: 3px 20px; font-size: 12px; line-height: 1.42857143; - color: #999; + color: #777; } .dropdown-backdrop { position: fixed; @@ -3578,11 +3578,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: #eee; } .nav > li.disabled > a { - color: #999; + color: #777; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #999; + color: #777; text-decoration: none; cursor: not-allowed; background-color: transparent; @@ -4176,7 +4176,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-color: #080808; } .navbar-inverse .navbar-brand { - color: #999; + color: #777; } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { @@ -4184,10 +4184,10 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: transparent; } .navbar-inverse .navbar-text { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { @@ -4234,7 +4234,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { @@ -4255,13 +4255,13 @@ fieldset[disabled] .navbar-default .btn-link:focus { } } .navbar-inverse .navbar-link { - color: #999; + color: #777; } .navbar-inverse .navbar-link:hover { color: #fff; } .navbar-inverse .btn-link { - color: #999; + color: #777; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { @@ -4289,7 +4289,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { content: "/\00a0"; } .breadcrumb > .active { - color: #999; + color: #777; } .pagination { display: inline-block; @@ -4349,7 +4349,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; border-color: #ddd; @@ -4418,7 +4418,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; } @@ -4448,11 +4448,11 @@ a.label:focus { top: -1px; } .label-default { - background-color: #999; + background-color: #777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #808080; + background-color: #5e5e5e; } .label-primary { background-color: #428bca; @@ -4500,7 +4500,7 @@ a.label:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - background-color: #999; + background-color: #777; border-radius: 10px; } .badge:empty { @@ -4733,7 +4733,7 @@ a.thumbnail.active { } .progress-bar[aria-valuenow="0"] { min-width: 30px; - color: #999; + color: #777; background-color: transparent; background-image: none; -webkit-box-shadow: none; @@ -4841,7 +4841,7 @@ a.list-group-item:focus { .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - color: #999; + color: #777; background-color: #eee; } .list-group-item.disabled .list-group-item-heading, @@ -4852,7 +4852,7 @@ a.list-group-item:focus { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #999; + color: #777; } .list-group-item.active, .list-group-item.active:hover, -- cgit v1.2.3 From 46e8a5817d0ddb98343dde1e0f0f8b335aba41e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 17:34:09 -0700 Subject: fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly --- 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 894605714..a3c5f9474 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -935,6 +935,7 @@ img { .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; + width: 100% \9; max-width: 100%; height: auto; } @@ -943,6 +944,7 @@ img { } .img-thumbnail { display: inline-block; + width: 100% \9; max-width: 100%; height: auto; padding: 4px; -- cgit v1.2.3 From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:19:17 -0700 Subject: fixes #13021: add .form-group-sm/-lg --- dist/css/bootstrap.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c5f9474..e78f38c4e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2480,7 +2480,8 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } -.input-sm { +.input-sm, +.form-horizontal .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; @@ -2495,7 +2496,8 @@ textarea.input-sm, select[multiple].input-sm { height: auto; } -.input-lg { +.input-lg, +.form-horizontal .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; @@ -2705,6 +2707,16 @@ select[multiple].input-lg { top: 0; right: 15px; } +@media (min-width: 768px) { + .form-horizontal .form-group-lg .control-label { + padding-top: 14.3px; + } +} +@media (min-width: 768px) { + .form-horizontal .form-group-sm .control-label { + padding-top: 6px; + } +} .btn { display: inline-block; padding: 6px 12px; -- cgit v1.2.3 From 74982cf101a8ca8e15c04e4f873d6b56e02c6c7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:23:25 -0700 Subject: grunt --- dist/css/bootstrap.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c5f9474..8650c3f6e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3200,6 +3200,7 @@ tbody.collapse.in { font-size: 12px; line-height: 1.42857143; color: #777; + white-space: nowrap; } .dropdown-backdrop { position: fixed; @@ -4866,7 +4867,13 @@ a.list-group-item:focus { } .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 { +.list-group-item.active:focus .list-group-item-heading, +.list-group-item.active .list-group-item-heading > small, +.list-group-item.active:hover .list-group-item-heading > small, +.list-group-item.active:focus .list-group-item-heading > small, +.list-group-item.active .list-group-item-heading > .small, +.list-group-item.active:hover .list-group-item-heading > .small, +.list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } .list-group-item.active .list-group-item-text, -- cgit v1.2.3 From 99f176e7ec678b4c9ea4fc973135d39a4553feab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:35:05 -0700 Subject: rewrite striped and active to deprecate the parent selectors, change the docs --- 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 8650c3f6e..087c2a97c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4718,14 +4718,16 @@ a.thumbnail.active { -o-transition: width .6s ease; transition: width .6s ease; } -.progress-striped .progress-bar { +.progress-striped .progress-bar, +.progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px; } -.progress.active .progress-bar { +.progress.active .progress-bar, +.progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; -- cgit v1.2.3 From 1e53dcd137e7d8c8abe26af610ebb14c26de1043 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 18:33:41 -0700 Subject: Fixes #13872: Always apply padding to .form-control-static for that vertical alignment --- dist/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 70431c368..b7e6f64c1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2621,6 +2621,8 @@ select[multiple].input-lg { top: 0; } .form-control-static { + padding-top: 7px; + padding-bottom: 7px; margin-bottom: 0; } .help-block { @@ -2692,10 +2694,6 @@ select[multiple].input-lg { margin-right: -15px; margin-left: -15px; } -.form-horizontal .form-control-static { - padding-top: 7px; - padding-bottom: 7px; -} @media (min-width: 768px) { .form-horizontal .control-label { padding-top: 7px; -- cgit v1.2.3 From e98fc373e3ef6e4a884a0142d50c765a9db5bd01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 20 Jun 2014 13:24:14 -0700 Subject: Fixes #13872 more: add overrides for lg and sm input modifiers --- dist/css/bootstrap.css | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b7e6f64c1..4b1923789 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2480,6 +2480,16 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } +.form-control-static { + padding-top: 7px; + padding-bottom: 7px; + margin-bottom: 0; +} +.form-control-static.input-lg, +.form-control-static.input-sm { + padding-right: 0; + padding-left: 0; +} .input-sm, .form-horizontal .form-group-sm .form-control { height: 30px; @@ -2620,11 +2630,6 @@ select[multiple].input-lg { .has-feedback label.sr-only ~ .form-control-feedback { top: 0; } -.form-control-static { - padding-top: 7px; - padding-bottom: 7px; - margin-bottom: 0; -} .help-block { display: block; margin-top: 5px; -- cgit v1.2.3 From df7cfe86525252034cf85a365d09a4c2485116b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jun 2014 10:38:45 -0700 Subject: Fixes #13903: Restore side padding on .btn-block --- dist/css/bootstrap.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4b1923789..f26735075 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3071,8 +3071,6 @@ fieldset[disabled] .btn-link:focus { .btn-block { display: block; width: 100%; - padding-right: 0; - padding-left: 0; } .btn-block + .btn-block { margin-top: 5px; -- cgit v1.2.3 From e40df7cfacef0b581810c8ec661923054541638c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jun 2014 16:56:36 -0700 Subject: fixes #13912: make radios/checkboxes work with inline forms again --- 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 f26735075..1d529e6db 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2676,7 +2676,7 @@ select[multiple].input-lg { } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { - float: none; + position: relative; margin-left: 0; } .form-inline .has-feedback .form-control-feedback { @@ -4029,7 +4029,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { - float: none; + position: relative; margin-left: 0; } .navbar-form .has-feedback .form-control-feedback { -- cgit v1.2.3 From ff6b279b3cd37e7e4e6bd93535afd016f6957afc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jun 2014 09:13:24 -0700 Subject: bump to v3.2.0 --- 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 1d529e6db..037dd0561 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.1.1 (http://getbootstrap.com) + * Bootstrap v3.2.0 (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From fec94e1695131a98187165bef9ec7528f0ec6ba2 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 27 Jun 2014 07:35:22 +0300 Subject: Update "grunt-autoprefixer". --- 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 037dd0561..d24c086c4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4860,6 +4860,7 @@ a.list-group-item:focus { .list-group-item.disabled:hover, .list-group-item.disabled:focus { color: #777; + cursor: not-allowed; background-color: #eee; } .list-group-item.disabled .list-group-item-heading, -- cgit v1.2.3 From 225351431eeb19178bf2679ee9e0936790a5c765 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 30 Jun 2014 18:35:17 +0300 Subject: Update dependencies. --- dist/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d24c086c4..270ce7479 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3859,7 +3859,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { left: 0; z-index: 1030; -webkit-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } @media (min-width: 768px) { @@ -5393,12 +5392,10 @@ button.close { -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; -webkit-transform: translate3d(0, -25%, 0); - -o-transform: translate3d(0, -25%, 0); transform: translate3d(0, -25%, 0); } .modal.in .modal-dialog { -webkit-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } .modal-open .modal { @@ -5988,7 +5985,6 @@ button.close { .affix { position: fixed; -webkit-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } @-ms-viewport { -- cgit v1.2.3 From b4958aba69cd942271bba465d5cbc8ef4a1d0529 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 22:54:56 -0700 Subject: merge in and resolve conflicts --- dist/css/bootstrap.css | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 270ce7479..d7d4ccc43 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2530,7 +2530,7 @@ select[multiple].input-lg { } .form-control-feedback { position: absolute; - top: 25px; + top: 0; right: 0; z-index: 2; display: block; @@ -2554,7 +2554,11 @@ select[multiple].input-lg { .has-success .radio, .has-success .checkbox, .has-success .radio-inline, -.has-success .checkbox-inline { +.has-success .checkbox-inline, +.has-success.radio label, +.has-success.checkbox label, +.has-success.radio-inline label, +.has-success.checkbox-inline label { color: #3c763d; } .has-success .form-control { @@ -2580,7 +2584,11 @@ select[multiple].input-lg { .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, -.has-warning .checkbox-inline { +.has-warning .checkbox-inline, +.has-warning.radio label, +.has-warning.checkbox label, +.has-warning.radio-inline label, +.has-warning.checkbox-inline label { color: #8a6d3b; } .has-warning .form-control { @@ -2606,7 +2614,11 @@ select[multiple].input-lg { .has-error .radio, .has-error .checkbox, .has-error .radio-inline, -.has-error .checkbox-inline { +.has-error .checkbox-inline, +.has-error.radio label, +.has-error.checkbox label, +.has-error.radio-inline label, +.has-error.checkbox-inline label { color: #a94442; } .has-error .form-control { @@ -2627,6 +2639,9 @@ select[multiple].input-lg { .has-error .form-control-feedback { color: #a94442; } +.has-feedback label ~ .form-control-feedback { + top: 25px; +} .has-feedback label.sr-only ~ .form-control-feedback { top: 0; } @@ -2707,7 +2722,6 @@ select[multiple].input-lg { } } .form-horizontal .has-feedback .form-control-feedback { - top: 0; right: 15px; } @media (min-width: 768px) { -- cgit v1.2.3 From 96b545c6b5ebf5f74b75a735359187bd9b80689d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 23:14:23 -0700 Subject: Fixes #13989: Don't extend the input sizes; manually chain the selectors --- 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 d7d4ccc43..3d5967461 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2491,35 +2491,41 @@ fieldset[disabled] .checkbox label { padding-left: 0; } .input-sm, -.form-horizontal .form-group-sm .form-control { +.form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -select.input-sm { +select.input-sm, +select.form-group-sm .form-control { height: 30px; line-height: 30px; } textarea.input-sm, -select[multiple].input-sm { +textarea.form-group-sm .form-control, +select[multiple].input-sm, +select[multiple].form-group-sm .form-control { height: auto; } .input-lg, -.form-horizontal .form-group-lg .form-control { +.form-group-l .form-control { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -select.input-lg { +select.input-lg, +select.form-group-l .form-control { height: 46px; line-height: 46px; } textarea.input-lg, -select[multiple].input-lg { +textarea.form-group-l .form-control, +select[multiple].input-lg, +select[multiple].form-group-l .form-control { height: auto; } .has-feedback { -- cgit v1.2.3 From fcf9470a20c18c36bd306d1a3a708ed09255a226 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 23:35:37 -0700 Subject: typo --- 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 3d5967461..77c196930 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2510,7 +2510,7 @@ select[multiple].form-group-sm .form-control { height: auto; } .input-lg, -.form-group-l .form-control { +.form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; @@ -2518,14 +2518,14 @@ select[multiple].form-group-sm .form-control { border-radius: 6px; } select.input-lg, -select.form-group-l .form-control { +select.form-group-lg .form-control { height: 46px; line-height: 46px; } textarea.input-lg, -textarea.form-group-l .form-control, +textarea.form-group-lg .form-control, select[multiple].input-lg, -select[multiple].form-group-l .form-control { +select[multiple].form-group-lg .form-control { height: auto; } .has-feedback { -- cgit v1.2.3 From 3537481c972c4b5ebb678e91cd477d1941f99424 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 3 Jul 2014 00:55:32 -0700 Subject: Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices --- 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 77c196930..c2b4f1a6f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3841,7 +3841,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-fixed-bottom .navbar-collapse { max-height: 340px; } -@media (max-width: 480px) and (orientation: landscape) { +@media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px; -- cgit v1.2.3 From 47521fd7d0b43a6ec062c0e722bfae033eb0a4eb Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 3 Jul 2014 12:53:23 +0200 Subject: Add touch-action: manipulate to buttons --- 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 c2b4f1a6f..c45210913 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2750,6 +2750,8 @@ select[multiple].form-group-lg .form-control { text-align: center; white-space: nowrap; vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; -- cgit v1.2.3 From 497597808319c74fe52aff1be41c0695ae40ee71 Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 3 Jul 2014 13:17:14 +0200 Subject: Remove superfluous cursor:pointer --- 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 c2b4f1a6f..727a1eadd 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3037,7 +3037,6 @@ fieldset[disabled] .btn-danger.active { .btn-link { font-weight: normal; color: #428bca; - cursor: pointer; border-radius: 0; } .btn-link, -- cgit v1.2.3 From 3c99de976497928fac0585bda2bf0961e3b162bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 19:57:15 -0700 Subject: grunt --- 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 727a1eadd..b58689e1c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3984,7 +3984,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { padding-top: 15px; padding-bottom: 15px; } - .navbar-nav.navbar-right:last-child { + .navbar-nav.navbar-right:first-child { margin-right: -15px; } } @@ -4070,7 +4070,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { -webkit-box-shadow: none; box-shadow: none; } - .navbar-form.navbar-right:last-child { + .navbar-form.navbar-right:first-child { margin-right: -15px; } } @@ -4105,7 +4105,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-left: 15px; } - .navbar-text.navbar-right:last-child { + .navbar-text.navbar-right:first-child { margin-right: 0; } } -- cgit v1.2.3 From 0378a6be2a5a42f408aeed24e20933039352ba74 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 19:59:50 -0700 Subject: Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 --- 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 b58689e1c..dedf1b3b9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4218,7 +4218,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: transparent; } .navbar-inverse .navbar-text { - color: #777; + color: #969696; } .navbar-inverse .navbar-nav > li > a { color: #777; -- cgit v1.2.3 From f22e7d857a4f7aa3f1def71e863b6ce761503928 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 20:01:18 -0700 Subject: Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress --- dist/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index dedf1b3b9..9b5eb82c4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4763,10 +4763,6 @@ a.thumbnail.active { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-bar[aria-valuenow="1"], -.progress-bar[aria-valuenow="2"] { - min-width: 30px; -} .progress-bar[aria-valuenow="0"] { min-width: 30px; color: #777; -- cgit v1.2.3 From 9677c95d83f361b7c3a43e56ef89590305c84905 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 20:02:02 -0700 Subject: Fixes #13967: Don't reset the cite element's font-style --- dist/css/bootstrap.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9b5eb82c4..73b5ad537 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1117,9 +1117,6 @@ small, .small { font-size: 85%; } -cite { - font-style: normal; -} mark, .mark { padding: .2em; -- cgit v1.2.3 From 043b40636c99c55d7331227401c447aefd699f4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 20:17:57 -0700 Subject: grunt --- dist/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 73b5ad537..48e9c841f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2117,12 +2117,10 @@ 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 { +.table-striped > tbody > tr:nth-child(odd) { background-color: #f9f9f9; } -.table-hover > tbody > tr:hover > td, -.table-hover > tbody > tr:hover > th { +.table-hover > tbody > tr:hover { background-color: #f5f5f5; } table col[class*="col-"] { -- cgit v1.2.3 From e2029e122c58d5bca7f439ea4c8220957acc8903 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 15:09:20 -0700 Subject: Fixes #13997: Move min-height for radio/checkbox to their inner label --- 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 48e9c841f..97f45da98 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2418,12 +2418,12 @@ input[type="month"].input-lg { .checkbox { position: relative; display: block; - min-height: 20px; margin-top: 10px; margin-bottom: 10px; } .radio label, .checkbox label { + min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; -- cgit v1.2.3 From 9be2bbb5efdc09eb5446719daa8ac892b93f2ede Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 16:48:41 -0700 Subject: Fixes #14053: Don't show radio/checkbox in justified button groups --- 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 97f45da98..351764c10 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3427,8 +3427,10 @@ tbody.collapse.in { .btn-group-justified > .btn-group .dropdown-menu { left: auto; } -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { +[data-toggle="buttons"] > .btn input[type="radio"], +[data-toggle="buttons"] > .btn-group > .btn input[type="radio"], +[data-toggle="buttons"] > .btn input[type="checkbox"], +[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; z-index: -1; filter: alpha(opacity=0); -- cgit v1.2.3 From 8e2348e9eda51296eb680192379ab37f10355ca3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 18:39:37 -0700 Subject: Fixes #13746: Add docs section for brand image --- 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 351764c10..5a17e9388 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3903,6 +3903,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-brand:focus { text-decoration: none; } +.navbar-brand > img { + display: block; +} @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { -- cgit v1.2.3 From a0d8d56593388790fba2b20acf117fb954e0766a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Jul 2014 00:59:51 -0700 Subject: grunt --- dist/css/bootstrap.css | 57 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0ae6337dd..14010f0bb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2758,13 +2758,17 @@ select[multiple].form-group-lg .form-control { } .btn:focus, .btn:active:focus, -.btn.active:focus { +.btn.active:focus, +.btn.focus, +.btn:active.focus, +.btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } .btn:hover, -.btn:focus { +.btn:focus, +.btn.focus { color: #333; text-decoration: none; } @@ -2792,6 +2796,7 @@ fieldset[disabled] .btn { } .btn-default:hover, .btn-default:focus, +.btn-default.focus, .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2813,6 +2818,9 @@ fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, +.btn-default.disabled.focus, +.btn-default[disabled].focus, +fieldset[disabled] .btn-default.focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, @@ -2833,6 +2841,7 @@ fieldset[disabled] .btn-default.active { } .btn-primary:hover, .btn-primary:focus, +.btn-primary.focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -2854,6 +2863,9 @@ fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled.focus, +.btn-primary[disabled].focus, +fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, @@ -2874,6 +2886,7 @@ fieldset[disabled] .btn-primary.active { } .btn-success:hover, .btn-success:focus, +.btn-success.focus, .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { @@ -2895,6 +2908,9 @@ fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, +.btn-success.disabled.focus, +.btn-success[disabled].focus, +fieldset[disabled] .btn-success.focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, @@ -2915,6 +2931,7 @@ fieldset[disabled] .btn-success.active { } .btn-info:hover, .btn-info:focus, +.btn-info.focus, .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { @@ -2936,6 +2953,9 @@ fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, +.btn-info.disabled.focus, +.btn-info[disabled].focus, +fieldset[disabled] .btn-info.focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, @@ -2956,6 +2976,7 @@ fieldset[disabled] .btn-info.active { } .btn-warning:hover, .btn-warning:focus, +.btn-warning.focus, .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { @@ -2977,6 +2998,9 @@ fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, +.btn-warning.disabled.focus, +.btn-warning[disabled].focus, +fieldset[disabled] .btn-warning.focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, @@ -2997,6 +3021,7 @@ fieldset[disabled] .btn-warning.active { } .btn-danger:hover, .btn-danger:focus, +.btn-danger.focus, .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { @@ -3018,6 +3043,9 @@ fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, +.btn-danger.disabled.focus, +.btn-danger[disabled].focus, +fieldset[disabled] .btn-danger.focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, @@ -3986,17 +4014,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { padding-top: 15px; padding-bottom: 15px; } - .navbar-nav.navbar-right:first-child { - margin-right: -15px; - } -} -@media (min-width: 768px) { - .navbar-left { - float: left !important; - } - .navbar-right { - float: right !important; - } } .navbar-form { padding: 10px 15px; @@ -4072,9 +4089,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { -webkit-box-shadow: none; box-shadow: none; } - .navbar-form.navbar-right:first-child { - margin-right: -15px; - } } .navbar-nav > li > .dropdown-menu { margin-top: 0; @@ -4107,7 +4121,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-left: 15px; } - .navbar-text.navbar-right:first-child { +} +@media (min-width: 768px) { + .navbar-left { + float: left !important; + } + .navbar-right { + float: right !important; + margin-right: -15px; + } + .navbar-right ~ .navbar-right { margin-right: 0; } } -- cgit v1.2.3