From 37c21a3ac7f86f5cac904a12af897b3051170d02 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 10:51:49 -0800 Subject: use Less' extend feature in btn-group-lg etc. --- dist/css/bootstrap.css | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e64956029..329b4fa2e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2311,19 +2311,22 @@ fieldset[disabled] .btn-link:focus { color: #999; text-decoration: none; } -.btn-lg { +.btn-lg, +.btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -.btn-sm { +.btn-sm, +.btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.btn-xs { +.btn-xs, +.btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; @@ -3196,24 +3199,6 @@ input[type="button"].btn-block { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group-xs > .btn { - padding: 1px 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 fda8d91c86a29cceab93285d920db56f7f26aaf8 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 15:39:15 -0800 Subject: use :extend in thumbnail Less --- dist/css/bootstrap.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 329b4fa2e..64762c0b3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -307,7 +307,9 @@ figure { img { vertical-align: middle; } -.img-responsive { +.img-responsive, +.thumbnail > img, +.thumbnail a > img { display: block; max-width: 100%; height: auto; @@ -4401,9 +4403,6 @@ a.list-group-item.active > .badge, } .thumbnail > img, .thumbnail a > img { - display: block; - max-width: 100%; - height: auto; margin-right: auto; margin-left: auto; } -- cgit v1.2.3 From 7c1511502ed96549c1674d1cda102551afe6dd30 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 15:52:26 -0800 Subject: use :extend(.img-responsive) in Carousel's Less --- dist/css/bootstrap.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 329b4fa2e..ab259fa6a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -307,7 +307,9 @@ figure { img { vertical-align: middle; } -.img-responsive { +.img-responsive, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto; @@ -5421,9 +5423,6 @@ button.close { } .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: block; - max-width: 100%; - height: auto; line-height: 1; } .carousel-inner > .active, -- cgit v1.2.3 From 228d4e59fcdb0e05811821a9aff899e7b4e5f4d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 01:21:58 -0800 Subject: Fixes #12555: Rearrange variables to place grids and containers closer --- 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 23202f62b..5b4e49bd1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1713,9 +1713,6 @@ output { -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); 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; -} .form-control::-moz-placeholder { color: #999; opacity: 1; -- cgit v1.2.3 From 3ccc16cad078cfcc76f3b9362f0039b0566d8914 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:24:37 -0800 Subject: grunt for days --- 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 5b4e49bd1..66db05317 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1733,6 +1733,9 @@ fieldset[disabled] .form-control { textarea.form-control { height: auto; } +input[type="search"] { + -webkit-appearance: none; +} input[type="date"] { line-height: 34px; } -- cgit v1.2.3 From d91d9b0ade9165c20d781ced128a751d0ae1fbda Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:38:01 -0800 Subject: Fixes #12447: Properly reset borders on table cells in panels --- dist/css/bootstrap.css | 78 ++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 66db05317..a583f11dc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4757,6 +4757,31 @@ a.list-group-item-danger.active:focus { .panel-body { padding: 15px; } +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel-heading > .dropdown .dropdown-toggle { + color: inherit; +} +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 16px; + color: inherit; +} +.panel-title > a { + color: inherit; +} +.panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel > .list-group { margin-bottom: 0; } @@ -4865,63 +4890,30 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0; } -.panel > .table-bordered > thead > tr:first-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, -.panel > .table-bordered > tbody > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, -.panel > .table-bordered > tfoot > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, -.panel > .table-bordered > tfoot > tr:first-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { - border-top: 0; +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { + border-bottom: 0; } -.panel > .table-bordered > thead > tr:last-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > th, -.panel > .table-bordered > tbody > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, -.panel > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-bordered > thead > tr:last-child > td, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td { +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, +.panel > .table-bordered > tbody > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, +.panel > .table-bordered > tfoot > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0; } .panel > .table-responsive { margin-bottom: 0; border: 0; } -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.panel-heading > .dropdown .dropdown-toggle { - color: inherit; -} -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: 16px; - color: inherit; -} -.panel-title > a { - color: inherit; -} -.panel-footer { - padding: 10px 15px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} .panel-group { margin-bottom: 20px; } -- cgit v1.2.3 From 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:58:10 -0800 Subject: Fixes #12486: Restore full width inputs for input groups in inline forms and navbars --- 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 66db05317..958f830d7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1723,6 +1723,7 @@ output { .form-control::-webkit-input-placeholder { color: #999; } +.form-control:disabled, .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { @@ -1939,6 +1940,9 @@ select[multiple].input-lg { width: auto; vertical-align: middle; } + .form-inline .input-group > .form-control { + width: 100%; + } .form-inline .control-label { margin-bottom: 0; vertical-align: middle; @@ -3854,6 +3858,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { width: auto; vertical-align: middle; } + .navbar-form .input-group > .form-control { + width: 100%; + } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle; -- cgit v1.2.3 From a0052b5a3745737777c88409ae08585ce75b285b Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Fri, 7 Feb 2014 14:14:32 +0100 Subject: Drop -o-user-select --- 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 958f830d7..3179cb643 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2007,7 +2007,6 @@ select[multiple].input-lg { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; - -o-user-select: none; user-select: none; background-image: none; border: 1px solid transparent; -- cgit v1.2.3 From a2f08158d032c1025ca0c6bf411b8282b606fb7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 15:44:50 -0800 Subject: Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4 --- 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 958f830d7..aef1e7890 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1723,7 +1723,6 @@ output { .form-control::-webkit-input-placeholder { color: #999; } -.form-control:disabled, .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { -- cgit v1.2.3