From 441f9d67179f766377eed4b0cedc5dc6eec290e4 Mon Sep 17 00:00:00 2001 From: Kevin Locke Date: Wed, 30 Oct 2013 18:37:17 -0600 Subject: Support .h1 in place of h1 inside .jumbotron As in #7284, it can often be useful to style text like a heading in places where using the heading tag would be either semantically incorrect, less accessible, or otherwise invalid. Support this in .jumbotron as in the rest of the document by allowing elements with class .h1 to stand in for the h1 element. Signed-off-by: Kevin Locke --- 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 9da8d0432..fb75349b5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5195,7 +5195,8 @@ a.list-group-item.active > .badge, background-color: #eeeeee; } -.jumbotron h1 { +.jumbotron h1, +.jumbotron .h1 { line-height: 1; color: inherit; } @@ -5217,7 +5218,8 @@ a.list-group-item.active > .badge, padding-right: 60px; padding-left: 60px; } - .jumbotron h1 { + .jumbotron h1, + .jumbotron .h1 { font-size: 63px; } } -- cgit v1.2.3 From 96109d3138fd6f5b67fb1108754e81c077630b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 7 Nov 2013 09:53:33 +0100 Subject: Simplify table state styles --- dist/css/bootstrap.css | 111 +++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 60 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6aef1f6fd..e3e6a57ef 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1716,84 +1716,75 @@ table th[class*="col-"] { float: none; } -.table > thead > tr > td.active, -.table > tbody > tr > td.active, -.table > tfoot > tr > td.active, -.table > thead > tr > th.active, -.table > tbody > tr > th.active, -.table > tfoot > tr > th.active, -.table > thead > tr.active > td, -.table > tbody > tr.active > td, -.table > tfoot > tr.active > td, -.table > thead > tr.active > th, -.table > tbody > tr.active > th, -.table > tfoot > tr.active > th { +.table > thead > tr > .active, +.table > tbody > tr > .active, +.table > tfoot > tr > .active, +.table > thead > .active > td, +.table > tbody > .active > td, +.table > tfoot > .active > td, +.table > thead > .active > th, +.table > tbody > .active > th, +.table > tfoot > .active > th { background-color: #f5f5f5; } -.table > thead > tr > td.success, -.table > tbody > tr > td.success, -.table > tfoot > tr > td.success, -.table > thead > tr > th.success, -.table > tbody > tr > th.success, -.table > tfoot > tr > th.success, -.table > thead > tr.success > td, -.table > tbody > tr.success > td, -.table > tfoot > tr.success > td, -.table > thead > tr.success > th, -.table > tbody > tr.success > th, -.table > tfoot > tr.success > th { +.table-hover > tbody > tr > .active:hover, +.table-hover > tbody > .active:hover > td, +.table-hover > tbody > .active:hover > th { + background-color: #e8e8e8; +} + +.table > thead > tr > .success, +.table > tbody > tr > .success, +.table > tfoot > tr > .success, +.table > thead > .success > td, +.table > tbody > .success > td, +.table > tfoot > .success > td, +.table > thead > .success > th, +.table > tbody > .success > th, +.table > tfoot > .success > th { background-color: #dff0d8; } -.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.success:hover > th { +.table-hover > tbody > tr > .success:hover, +.table-hover > tbody > .success:hover > td, +.table-hover > tbody > .success:hover > th { background-color: #d0e9c6; } -.table > thead > tr > td.danger, -.table > tbody > tr > td.danger, -.table > tfoot > tr > td.danger, -.table > thead > tr > th.danger, -.table > tbody > tr > th.danger, -.table > tfoot > tr > th.danger, -.table > thead > tr.danger > td, -.table > tbody > tr.danger > td, -.table > tfoot > tr.danger > td, -.table > thead > tr.danger > th, -.table > tbody > tr.danger > th, -.table > tfoot > tr.danger > th { +.table > thead > tr > .danger, +.table > tbody > tr > .danger, +.table > tfoot > tr > .danger, +.table > thead > .danger > td, +.table > tbody > .danger > td, +.table > tfoot > .danger > td, +.table > thead > .danger > th, +.table > tbody > .danger > th, +.table > tfoot > .danger > th { background-color: #f2dede; } -.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.danger:hover > th { +.table-hover > tbody > tr > .danger:hover, +.table-hover > tbody > .danger:hover > td, +.table-hover > tbody > .danger:hover > th { background-color: #ebcccc; } -.table > thead > tr > td.warning, -.table > tbody > tr > td.warning, -.table > tfoot > tr > td.warning, -.table > thead > tr > th.warning, -.table > tbody > tr > th.warning, -.table > tfoot > tr > th.warning, -.table > thead > tr.warning > td, -.table > tbody > tr.warning > td, -.table > tfoot > tr.warning > td, -.table > thead > tr.warning > th, -.table > tbody > tr.warning > th, -.table > tfoot > tr.warning > th { +.table > thead > tr > .warning, +.table > tbody > tr > .warning, +.table > tfoot > tr > .warning, +.table > thead > .warning > td, +.table > tbody > .warning > td, +.table > tfoot > .warning > td, +.table > thead > .warning > th, +.table > tbody > .warning > th, +.table > tfoot > .warning > th { background-color: #fcf8e3; } -.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.warning:hover > th { +.table-hover > tbody > tr > .warning:hover, +.table-hover > tbody > .warning:hover > td, +.table-hover > tbody > .warning:hover > th { background-color: #faf2cc; } -- cgit v1.2.3 From 09cd5289ab540486a9c601e79860b34a2fe1873c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 17:47:27 -0800 Subject: Fixes #11468: Prevent default gradient on in Firefox for Android --- 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 8aabfb85d..53dc6233a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4475,6 +4475,7 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-bottom: 8px; background-color: transparent; + background-image: none; border: 1px solid transparent; border-radius: 4px; } -- cgit v1.2.3 From a4c54b5e5d948e9ec7cdd22bc0efa2241d2605c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 18:33:59 -0800 Subject: Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar --- 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 53dc6233a..49d060008 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5179,6 +5179,10 @@ a.list-group-item.active > .badge, border-radius: 6px; } +.jumbotron .container { + max-width: 100%; +} + @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; -- cgit v1.2.3 From 36b82c37ecbedd13f9a2f3eca545745eb8eedf75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 21:59:28 -0800 Subject: Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies --- 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 49d060008..6d3a9e1e9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2070,7 +2070,7 @@ textarea.input-sm { } .input-lg { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2078,8 +2078,8 @@ textarea.input-sm { } select.input-lg { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-lg { @@ -3884,7 +3884,7 @@ input[type="button"].btn-block { .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -3894,8 +3894,8 @@ input[type="button"].btn-block { select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-group-lg > .form-control, -- cgit v1.2.3 From bf9f39270c7c6d50b0355a0b1a5e470c0820af07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 22:03:49 -0800 Subject: Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop --- 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 6d3a9e1e9..7d9961d3c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5909,7 +5909,7 @@ button.close { position: relative; z-index: 1050; width: auto; - padding: 10px; + margin: 10px; margin-right: auto; margin-left: auto; } @@ -6009,8 +6009,8 @@ button.close { @media screen and (min-width: 768px) { .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin-top: 30px; + margin-bottom: 30px; } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); -- cgit v1.2.3 From e4848286c86af39c5a30c845748fdc46de8b8dd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 23:19:04 -0800 Subject: Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles --- 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 7d9961d3c..afd259372 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5198,10 +5198,7 @@ a.list-group-item.active > .badge, } .thumbnail { - display: inline-block; display: block; - height: auto; - max-width: 100%; padding: 4px; margin-bottom: 20px; line-height: 1.428571429; -- cgit v1.2.3 From 9f0da54856f6a4111b4d9f8780db2b2257ef90b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 23:29:34 -0800 Subject: grunt to get dist files --- 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 64740d9df..9aa88986f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3789,7 +3789,8 @@ input[type="button"].btn-block { } .btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; -- cgit v1.2.3 From a7a9dcaeb2231b2580cf79fcee7d777b98ac24d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 00:42:36 -0800 Subject: Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it --- 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 780d9624c..72f5005e0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.2 by @fat and @mdo + * Bootstrap v3.0.2 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. */ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ -- cgit v1.2.3 From a52e528d2771e0f150682532b06c0f29fa6b0ad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 11:56:06 -0800 Subject: Fix up new margins on modals by not setting auto until screen-sm-min --- dist/css/bootstrap.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ab5cb93e8..84fb9c5c8 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5899,8 +5899,6 @@ button.close { z-index: 1050; width: auto; margin: 10px; - margin-right: auto; - margin-left: auto; } .modal-content { @@ -5998,8 +5996,7 @@ button.close { @media screen and (min-width: 768px) { .modal-dialog { width: 600px; - margin-top: 30px; - margin-bottom: 30px; + margin: 30px auto; } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); -- cgit v1.2.3 From 853b69f2dfe66a839efa6216e9e7c1a530f92f62 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 12:52:08 -0800 Subject: Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas --- 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 84fb9c5c8..14687bd51 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3860,7 +3860,7 @@ input[type="button"].btn-block { border-collapse: separate; } -.input-group.col { +.input-group[class*="col-"] { float: none; padding-right: 0; padding-left: 0; -- cgit v1.2.3