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 0da3901ed5a6d498af8b7c76b61d004a003f716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 8 Nov 2013 10:30:15 +0100 Subject: Add missing `.small` styles and 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 6aef1f6fd..6d9bead8d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -692,13 +692,15 @@ blockquote p:last-child { margin-bottom: 0; } -blockquote small { +blockquote small, +blockquote .small { display: block; line-height: 1.428571429; color: #999999; } -blockquote small:before { +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } -- cgit v1.2.3 From bff8ba2b794305842d7a712a1bf6e400b898b7c0 Mon Sep 17 00:00:00 2001 From: Jesse Mandel Date: Mon, 25 Nov 2013 15:19:11 -0800 Subject: Fix for Issue #11411 --- 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 d8dfe14c4..7b4443405 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1953,6 +1953,7 @@ output { .form-control::-moz-placeholder { color: #999999; + opacity: 1; } .form-control:-ms-input-placeholder { @@ -5655,7 +5656,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel > .table, -.panel > .table-responsive { +.panel > .table-responsive > .table { margin-bottom: 0; } -- cgit v1.2.3 From 9829c86f7ca5c76ef21892ec1198858eebc99392 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Nov 2013 15:21:27 -0800 Subject: run grunt --- 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 d8dfe14c4..c5a55a37f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1953,6 +1953,7 @@ output { .form-control::-moz-placeholder { color: #999999; + opacity: 1; } .form-control:-ms-input-placeholder { -- cgit v1.2.3 From 3d5e598e5c9bc4d0573266e9a0aa84f988683285 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 18:40:15 +0100 Subject: add builded files from dist/ --- dist/css/bootstrap.css | 127 ++++--------------------------------------------- 1 file changed, 10 insertions(+), 117 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c5a55a37f..b11416e1f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,11 +1,11 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * 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. - */ - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * 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 */ article, @@ -3461,7 +3461,7 @@ input[type="button"].btn-block { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid #000000; + border-top: 4px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; } @@ -3581,7 +3581,7 @@ input[type="button"].btn-block { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid #000000; + border-bottom: 4px solid; content: ""; } @@ -3599,30 +3599,6 @@ input[type="button"].btn-block { } } -.btn-default .caret { - border-top-color: #333333; -} - -.btn-primary .caret, -.btn-success .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret { - border-top-color: #fff; -} - -.dropup .btn-default .caret { - border-bottom-color: #333333; -} - -.dropup .btn-primary .caret, -.dropup .btn-success .caret, -.dropup .btn-warning .caret, -.dropup .btn-danger .caret, -.dropup .btn-info .caret { - border-bottom-color: #fff; -} - .btn-group, .btn-group-vertical { position: relative; @@ -4102,13 +4078,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #428bca; } -.nav .open > a .caret, -.nav .open > a:hover .caret, -.nav .open > a:focus .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav .nav-divider { height: 1px; margin: 9px 0; @@ -4221,13 +4190,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #428bca; } -.nav-pills > li.active > a .caret, -.nav-pills > li.active > a:hover .caret, -.nav-pills > li.active > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - .nav-stacked > li { float: none; } @@ -4300,16 +4262,6 @@ textarea.input-group-sm > .input-group-btn > .btn { display: block; } -.nav .caret { - border-top-color: #428bca; - border-bottom-color: #428bca; -} - -.nav a:hover .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; @@ -4739,12 +4691,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #e7e7e7; } -.navbar-default .navbar-nav > .dropdown > a:hover .caret, -.navbar-default .navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { @@ -4752,18 +4698,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #e7e7e7; } -.navbar-default .navbar-nav > .open > a .caret, -.navbar-default .navbar-nav > .open > a:hover .caret, -.navbar-default .navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar-default .navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777777; @@ -4863,23 +4797,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #080808; } -.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-nav > .dropdown > a .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .navbar-nav > .open > a .caret, -.navbar-inverse .navbar-nav > .open > a:hover .caret, -.navbar-inverse .navbar-nav > .open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; @@ -5784,10 +5701,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #dddddd; } -.panel-default > .panel-heading > .dropdown .caret { - border-color: #333333 transparent; -} - .panel-default > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #dddddd; } @@ -5806,10 +5719,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #428bca; } -.panel-primary > .panel-heading > .dropdown .caret { - border-color: #ffffff transparent; -} - .panel-primary > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #428bca; } @@ -5828,10 +5737,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #d6e9c6; } -.panel-success > .panel-heading > .dropdown .caret { - border-color: #468847 transparent; -} - .panel-success > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #d6e9c6; } @@ -5850,10 +5755,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #faebcc; } -.panel-warning > .panel-heading > .dropdown .caret { - border-color: #c09853 transparent; -} - .panel-warning > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #faebcc; } @@ -5872,10 +5773,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #ebccd1; } -.panel-danger > .panel-heading > .dropdown .caret { - border-color: #b94a48 transparent; -} - .panel-danger > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #ebccd1; } @@ -5894,10 +5791,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #bce8f1; } -.panel-info > .panel-heading > .dropdown .caret { - border-color: #3a87ad transparent; -} - .panel-info > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #bce8f1; } -- cgit v1.2.3 From 594d0c700dacbce8805bab1be6111631c8e003fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 11:33:00 -0800 Subject: grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing --- dist/css/bootstrap.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b11416e1f..60e2330c5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,11 +1,11 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * 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. - */ - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * 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 */ article, -- cgit v1.2.3 From 9d485db721ba248224696eb63eafdfabad1fcbe2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:34:42 -0800 Subject: run grunt after last merge --- 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 75d27fde8..832a0e85f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -333,7 +333,7 @@ a:focus { } a:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1902,7 +1902,7 @@ select optgroup { input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2257,7 +2257,7 @@ textarea.input-lg { } .btn:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -- cgit v1.2.3 From 9f68a5b241fff2adce3b95b5c5b486e84a1d88d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:39:39 -0800 Subject: Fixes #11516: Invert dropdown divider border in navbars --- 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 832a0e85f..30dfb4856 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4801,6 +4801,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; } + .navbar-inverse .navbar-nav .open .dropdown-menu .divider { + background-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } -- cgit v1.2.3 From c13524e7e0f3d2a62935bbe2cb57c1388e04e052 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:49:51 -0800 Subject: Fixes #11553: Prevent double border on tables in panels without thead content --- 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 30dfb4856..e5ce19d47 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5585,6 +5585,11 @@ a.list-group-item.active:focus .list-group-item-text { border-top: 1px solid #dddddd; } +.panel > .table > tbody:first-child th, +.panel > .table > tbody:first-child td { + border-top: 0; +} + .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0; -- cgit v1.2.3 From 9d939080e6536277ec47d19e113bff7376489ff9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 14:22:31 -0800 Subject: Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class --- dist/css/bootstrap.css | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e5ce19d47..9b94a0a30 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -807,6 +807,24 @@ pre code { clear: both; } +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + .row { margin-right: -15px; margin-left: -15px; @@ -1105,9 +1123,6 @@ pre code { } @media (min-width: 768px) { - .container { - width: 750px; - } .col-sm-1, .col-sm-2, .col-sm-3, @@ -1277,9 +1292,6 @@ pre code { } @media (min-width: 992px) { - .container { - width: 970px; - } .col-md-1, .col-md-2, .col-md-3, @@ -1449,9 +1461,6 @@ pre code { } @media (min-width: 1200px) { - .container { - width: 1170px; - } .col-lg-1, .col-lg-2, .col-lg-3, -- cgit v1.2.3 From d654f905028a40893fa553f529d12dceec879cf7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 15:37:11 -0800 Subject: Fixes #10147: Remove outline from carousel controls on focus --- 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 9b94a0a30..8e31b72da 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6363,6 +6363,7 @@ button.close { .carousel-control:focus { color: #ffffff; text-decoration: none; + outline: none; opacity: 0.9; filter: alpha(opacity=90); } -- cgit v1.2.3 From 08e41d769a5fc34b60a307721dacc34eb36f1a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 29 Nov 2013 08:37:54 +0100 Subject: Add missing last column float --- dist/css/bootstrap.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8aabfb85d..ad80981a4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -916,7 +916,8 @@ pre code { .col-xs-8, .col-xs-9, .col-xs-10, -.col-xs-11 { +.col-xs-11, +.col-xs-12 { float: left; } @@ -1135,7 +1136,8 @@ pre code { .col-sm-8, .col-sm-9, .col-sm-10, - .col-sm-11 { + .col-sm-11, + .col-sm-12 { float: left; } .col-sm-12 { @@ -1304,7 +1306,8 @@ pre code { .col-md-8, .col-md-9, .col-md-10, - .col-md-11 { + .col-md-11, + .col-md-12 { float: left; } .col-md-12 { @@ -1473,7 +1476,8 @@ pre code { .col-lg-8, .col-lg-9, .col-lg-10, - .col-lg-11 { + .col-lg-11, + .col-lg-12 { float: left; } .col-lg-12 { -- 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 From 21e2ae94897376ff0303144a703f7eb54be9bf3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 14:53:54 -0800 Subject: Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color --- 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 a23a1ce22..78f0cbe23 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5664,6 +5664,7 @@ a.list-group-item.active:focus .list-group-item-text { margin-top: 0; margin-bottom: 0; font-size: 16px; + color: inherit; } .panel-title > a { -- cgit v1.2.3 From d2f8b5327b36b9a9839d595070d841146aa4c6ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 14:58:35 -0800 Subject: Fixes #11515: Reorder the headings with body text and text emphasis classes --- dist/css/bootstrap.css | 164 ++++++++++++++++++++++++------------------------- 1 file changed, 82 insertions(+), 82 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 78f0cbe23..7bbca94a4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -385,88 +385,6 @@ hr { border: 0; } -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 16px; - font-weight: 200; - line-height: 1.4; -} - -@media (min-width: 768px) { - .lead { - font-size: 21px; - } -} - -small, -.small { - font-size: 85%; -} - -cite { - font-style: normal; -} - -.text-muted { - color: #999999; -} - -.text-primary { - color: #428bca; -} - -.text-primary:hover { - color: #3071a9; -} - -.text-warning { - color: #8a6d3b; -} - -.text-warning:hover { - color: #66512c; -} - -.text-danger { - color: #a94442; -} - -.text-danger:hover { - color: #843534; -} - -.text-success { - color: #3c763d; -} - -.text-success:hover { - color: #2b542c; -} - -.text-info { - color: #31708f; -} - -.text-info:hover { - color: #245269; -} - -.text-left { - text-align: left; -} - -.text-right { - text-align: right; -} - -.text-center { - text-align: center; -} - h1, h2, h3, @@ -576,6 +494,88 @@ h6, font-size: 12px; } +p { + margin: 0 0 10px; +} + +.lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; +} + +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} + +small, +.small { + font-size: 85%; +} + +cite { + font-style: normal; +} + +.text-muted { + color: #999999; +} + +.text-primary { + color: #428bca; +} + +.text-primary:hover { + color: #3071a9; +} + +.text-warning { + color: #8a6d3b; +} + +.text-warning:hover { + color: #66512c; +} + +.text-danger { + color: #a94442; +} + +.text-danger:hover { + color: #843534; +} + +.text-success { + color: #3c763d; +} + +.text-success:hover { + color: #2b542c; +} + +.text-info { + color: #31708f; +} + +.text-info:hover { + color: #245269; +} + +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + .page-header { padding-bottom: 9px; margin: 40px 0 20px; -- cgit v1.2.3 From 7aa6b4190be5316756fa179bb192258ce3b47548 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 15:57:25 -0800 Subject: Fixes #11402: Set width: auto; to select.form-control within .form-inline --- 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 7bbca94a4..03859d52a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2180,6 +2180,9 @@ textarea.input-lg { .form-inline .form-control { display: inline-block; } + .form-inline select.form-control { + width: auto; + } .form-inline .radio, .form-inline .checkbox { display: inline-block; @@ -4568,6 +4571,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-form .form-control { display: inline-block; } + .navbar-form select.form-control { + width: auto; + } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; -- cgit v1.2.3 From 67d4e3323d322ec7c6719204ca02732576c7ee7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:18:07 -0800 Subject: Fixes #11277: Drop the abbr element from the .initialism selector --- 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 03859d52a..ebd20fc44 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -669,7 +669,7 @@ abbr[data-original-title] { border-bottom: 1px dotted #999999; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } -- cgit v1.2.3 From 6bc09dd94949e05827c541795e4133b0cdbf7cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:29:52 -0800 Subject: Fixes #11268: Account for badges within buttons by matching background to text color and text color to background --- dist/css/bootstrap.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ebd20fc44..69a2009f3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2335,6 +2335,11 @@ fieldset[disabled] .btn-default.active { border-color: #cccccc; } +.btn-default .badge { + color: #ffffff; + background-color: #fff; +} + .btn-primary { color: #ffffff; background-color: #428bca; @@ -2376,6 +2381,11 @@ fieldset[disabled] .btn-primary.active { border-color: #357ebd; } +.btn-primary .badge { + color: #428bca; + background-color: #fff; +} + .btn-warning { color: #ffffff; background-color: #f0ad4e; @@ -2417,6 +2427,11 @@ fieldset[disabled] .btn-warning.active { border-color: #eea236; } +.btn-warning .badge { + color: #f0ad4e; + background-color: #fff; +} + .btn-danger { color: #ffffff; background-color: #d9534f; @@ -2458,6 +2473,11 @@ fieldset[disabled] .btn-danger.active { border-color: #d43f3a; } +.btn-danger .badge { + color: #d9534f; + background-color: #fff; +} + .btn-success { color: #ffffff; background-color: #5cb85c; @@ -2499,6 +2519,11 @@ fieldset[disabled] .btn-success.active { border-color: #4cae4c; } +.btn-success .badge { + color: #5cb85c; + background-color: #fff; +} + .btn-info { color: #ffffff; background-color: #5bc0de; @@ -2540,6 +2565,11 @@ fieldset[disabled] .btn-info.active { border-color: #46b8da; } +.btn-info .badge { + color: #5bc0de; + background-color: #fff; +} + .btn-link { font-weight: normal; color: #428bca; -- cgit v1.2.3 From 22da6fcfb269e78f6d89cd17e6f63f45d19ae8e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 21:17:53 -0800 Subject: grunt --- 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 69a2009f3..811aaab37 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5091,6 +5091,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .label { + position: relative; + top: -1px; +} + .label-default { background-color: #999999; } @@ -5164,6 +5169,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .badge { + position: relative; + top: -1px; +} + a.badge:hover, a.badge:focus { color: #ffffff; @@ -5171,11 +5181,6 @@ a.badge:focus { cursor: pointer; } -.btn .badge { - position: relative; - top: -1px; -} - a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; -- cgit v1.2.3 From cf40b5db60fa238b24a92567860006c1581261f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:04:55 -0800 Subject: Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox --- 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 811aaab37..7c9727349 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1719,6 +1719,7 @@ th { } table col[class*="col-"] { + position: static; display: table-column; float: none; } -- cgit v1.2.3 From 841da88f3fc93740cca07b6e4581a333d77964f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:08:41 -0800 Subject: Remove browser default top margin from dl elements --- 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 7c9727349..9d73dc82f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -616,6 +616,7 @@ ol ol { } dl { + margin-top: 0; margin-bottom: 20px; } -- cgit v1.2.3 From 48269dcd282f05be79c9bb8cba032c745b3b337a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:17:43 -0800 Subject: Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below --- 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 9d73dc82f..ede81b5a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2209,6 +2209,11 @@ textarea.input-lg { margin-bottom: 0; } +.form-horizontal .radio, +.form-horizontal .checkbox { + min-height: 27px; +} + .form-horizontal .form-group { margin-right: -15px; margin-left: -15px; -- cgit v1.2.3