From afb6cf1d01c28bd0a1c6803f727eb7408b70c16e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Sep 2013 16:58:56 -0700 Subject: Match order of vars to order of components; darken some alert borders --- 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 615e19833..c2b5eaa5d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1575,7 +1575,7 @@ table th[class*="col-"] { .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { background-color: #fcf8e3; - border-color: #fbeed5; + border-color: #faebcc; } .table-hover > tbody > tr > td.warning:hover, @@ -1583,7 +1583,7 @@ table th[class*="col-"] { .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc; - border-color: #f8e5be; + border-color: #f7e1b5; } @media (max-width: 768px) { @@ -5131,11 +5131,11 @@ a.thumbnail:focus { .alert-warning { color: #c09853; background-color: #fcf8e3; - border-color: #fbeed5; + border-color: #faebcc; } .alert-warning hr { - border-top-color: #f8e5be; + border-top-color: #f7e1b5; } .alert-warning .alert-link { @@ -5590,21 +5590,21 @@ a.list-group-item:focus { } .panel-warning { - border-color: #fbeed5; + border-color: #faebcc; } .panel-warning > .panel-heading { color: #c09853; background-color: #fcf8e3; - border-color: #fbeed5; + border-color: #faebcc; } .panel-warning > .panel-heading + .panel-collapse .panel-body { - border-top-color: #fbeed5; + border-top-color: #faebcc; } .panel-warning > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #fbeed5; + border-bottom-color: #faebcc; } .panel-danger { -- cgit v1.2.3 From fff5e540f5fb29ea3c2de713c0d6b10642c90e75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Sep 2013 20:03:52 -0700 Subject: fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally --- dist/css/bootstrap.css | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c2b5eaa5d..3e5a31f05 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1551,7 +1551,7 @@ table th[class*="col-"] { .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { background-color: #f2dede; - border-color: #eed3d7; + border-color: #ebccd1; } .table-hover > tbody > tr > td.danger:hover, @@ -1559,7 +1559,7 @@ table th[class*="col-"] { .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc; - border-color: #e6c1c7; + border-color: #e4b9c0; } .table > thead > tr > td.warning, @@ -1598,7 +1598,6 @@ table th[class*="col-"] { } .table-responsive > .table { margin-bottom: 0; - background-color: #fff; } .table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, @@ -5145,11 +5144,11 @@ a.thumbnail:focus { .alert-danger { color: #b94a48; background-color: #f2dede; - border-color: #eed3d7; + border-color: #ebccd1; } .alert-danger hr { - border-top-color: #e6c1c7; + border-top-color: #e4b9c0; } .alert-danger .alert-link { @@ -5608,21 +5607,21 @@ a.list-group-item:focus { } .panel-danger { - border-color: #eed3d7; + border-color: #ebccd1; } .panel-danger > .panel-heading { color: #b94a48; background-color: #f2dede; - border-color: #eed3d7; + border-color: #ebccd1; } .panel-danger > .panel-heading + .panel-collapse .panel-body { - border-top-color: #eed3d7; + border-top-color: #ebccd1; } .panel-danger > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #eed3d7; + border-bottom-color: #ebccd1; } .panel-info { -- cgit v1.2.3 From a9335e94e1ed7578bc8ec20140b0846666f06a1a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Sep 2013 18:59:09 -0700 Subject: run grunt dist --- 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 3e5a31f05..32805eafc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6290,7 +6290,8 @@ body.modal-open, @media screen and (min-width: 768px) { .carousel-control .glyphicons-chevron-left, - .carousel-control .glyphicons-chevron-right .icon-prev, + .carousel-control .glyphicons-chevron-right, + .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; height: 30px; -- cgit v1.2.3 From 2b5d7d23d0e6de93cd0ba8b1d4eee480e4cb504d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Sep 2013 19:21:44 -0700 Subject: generate CSS banners via Gruntfile; fixes #10101 --- dist/css/bootstrap.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 32805eafc..c6d94ced6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,13 +1,10 @@ /*! - * Bootstrap v3.0.0 - * - * Copyright 2013 Twitter, Inc - * Licensed under the Apache License v2.0 - * 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.0 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.0 | MIT License | git.io/normalize */ article, -- cgit v1.2.3 From 5d1707a25c0ee68644a182196439a86be1beafbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 11:09:50 -0700 Subject: Remove old and unused .prettyprint styles in code.less (per #10566) --- 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 3e5a31f05..10f59c305 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -737,10 +737,6 @@ pre { border-radius: 4px; } -pre.prettyprint { - margin-bottom: 20px; -} - pre code { padding: 0; font-size: inherit; -- cgit v1.2.3 From 2dc7ab4bbb70abfcdb0aa179935c72ddbb3e66e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 14:46:31 -0700 Subject: fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs --- dist/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 3c53283ea..0e56cf744 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6348,12 +6348,6 @@ body.modal-open, width: device-width; } -@media screen and (max-width: 400px) { - @-ms-viewport { - width: 320px; - } -} - .hidden { display: none !important; visibility: hidden !important; -- cgit v1.2.3 From 6e064894db4a67ed2c1180212426a076a494d300 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 14:56:02 -0700 Subject: remove unnecessary right and left properties on .modal-dialog --- 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 3c53283ea..87ccb4ec1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5823,8 +5823,6 @@ body.modal-open, @media screen and (min-width: 768px) { .modal-dialog { - right: auto; - left: 50%; width: 600px; padding-top: 30px; padding-bottom: 30px; -- cgit v1.2.3 From 28e5572bf4de4e98b62421dc7d33e8b353fff382 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Sep 2013 23:11:18 -0700 Subject: Fixes #10492: Account for responsive tables in panels --- dist/css/bootstrap.css | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6a08d995a..836b74107 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5431,42 +5431,63 @@ a.list-group-item:focus { border-top-width: 0; } -.panel > .table { +.panel > .table, +.panel > .table-responsive { margin-bottom: 0; } -.panel > .panel-body + .table { +.panel > .panel-body + .table, +.panel > .panel-body + .table-responsive { border-top: 1px solid #dddddd; } -.panel > .table-bordered { +.panel > .table-bordered, +.panel > .table-responsive > .table-bordered { border: 0; } .panel > .table-bordered > thead > tr > th:first-child, +.panel > .table-responsive > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child, +.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > thead > tr > td:first-child, +.panel > .table-responsive > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child, -.panel > .table-bordered > tfoot > tr > td:first-child { +.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, +.panel > .table-bordered > tfoot > tr > td:first-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0; } .panel > .table-bordered > thead > tr > th:last-child, +.panel > .table-responsive > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child, +.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > thead > tr > td:last-child, +.panel > .table-responsive > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child, -.panel > .table-bordered > tfoot > tr > td:last-child { +.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, +.panel > .table-bordered > tfoot > tr > td:last-child, +.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 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-bordered > tfoot > 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 { border-bottom: 0; } -- cgit v1.2.3 From 4d4976fdcc3f2e88408a7993854a7cfbafd0c6ec Mon Sep 17 00:00:00 2001 From: Jake Buob Date: Fri, 13 Sep 2013 15:56:30 -0400 Subject: Make nav pills border-radius border-radius-base --- 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 836b74107..c6490a40d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3951,7 +3951,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .nav-pills > li > a { - border-radius: 5px; + border-radius: 4px; } .nav-pills > li + li { -- cgit v1.2.3 From 63d1d09ebda9839a6d84ce76dec45c25b752178e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 16 Sep 2013 21:43:55 -0700 Subject: run grunt --- dist/css/bootstrap.css | 188 ++++++++++++------------------------------------- 1 file changed, 45 insertions(+), 143 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 836b74107..de2a00185 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4489,7 +4489,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #e6e6e6; + border-color: #e7e7e7; } .navbar-default .navbar-nav > .dropdown > a:hover .caret, @@ -6372,14 +6372,8 @@ body.modal-open, visibility: hidden !important; } -.visible-xs { - display: none !important; -} - -tr.visible-xs { - display: none !important; -} - +.visible-xs, +tr.visible-xs, th.visible-xs, td.visible-xs { display: none !important; @@ -6437,14 +6431,8 @@ td.visible-xs { } } -.visible-sm { - display: none !important; -} - -tr.visible-sm { - display: none !important; -} - +.visible-sm, +tr.visible-sm, th.visible-sm, td.visible-sm { display: none !important; @@ -6502,14 +6490,8 @@ td.visible-sm { } } -.visible-md { - display: none !important; -} - -tr.visible-md { - display: none !important; -} - +.visible-md, +tr.visible-md, th.visible-md, td.visible-md { display: none !important; @@ -6567,14 +6549,8 @@ td.visible-md { } } -.visible-lg { - display: none !important; -} - -tr.visible-lg { - display: none !important; -} - +.visible-lg, +tr.visible-lg, th.visible-lg, td.visible-lg { display: none !important; @@ -6646,12 +6622,8 @@ td.hidden-xs { } @media (max-width: 767px) { - .hidden-xs { - display: none !important; - } - tr.hidden-xs { - display: none !important; - } + .hidden-xs, + tr.hidden-xs, th.hidden-xs, td.hidden-xs { display: none !important; @@ -6659,12 +6631,8 @@ td.hidden-xs { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm { - display: none !important; - } - tr.hidden-xs.hidden-sm { - display: none !important; - } + .hidden-xs.hidden-sm, + tr.hidden-xs.hidden-sm, th.hidden-xs.hidden-sm, td.hidden-xs.hidden-sm { display: none !important; @@ -6672,12 +6640,8 @@ td.hidden-xs { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md { - display: none !important; - } - tr.hidden-xs.hidden-md { - display: none !important; - } + .hidden-xs.hidden-md, + tr.hidden-xs.hidden-md, th.hidden-xs.hidden-md, td.hidden-xs.hidden-md { display: none !important; @@ -6685,12 +6649,8 @@ td.hidden-xs { } @media (min-width: 1200px) { - .hidden-xs.hidden-lg { - display: none !important; - } - tr.hidden-xs.hidden-lg { - display: none !important; - } + .hidden-xs.hidden-lg, + tr.hidden-xs.hidden-lg, th.hidden-xs.hidden-lg, td.hidden-xs.hidden-lg { display: none !important; @@ -6711,12 +6671,8 @@ td.hidden-sm { } @media (max-width: 767px) { - .hidden-sm.hidden-xs { - display: none !important; - } - tr.hidden-sm.hidden-xs { - display: none !important; - } + .hidden-sm.hidden-xs, + tr.hidden-sm.hidden-xs, th.hidden-sm.hidden-xs, td.hidden-sm.hidden-xs { display: none !important; @@ -6724,12 +6680,8 @@ td.hidden-sm { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-sm { - display: none !important; - } - tr.hidden-sm { - display: none !important; - } + .hidden-sm, + tr.hidden-sm, th.hidden-sm, td.hidden-sm { display: none !important; @@ -6737,12 +6689,8 @@ td.hidden-sm { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md { - display: none !important; - } - tr.hidden-sm.hidden-md { - display: none !important; - } + .hidden-sm.hidden-md, + tr.hidden-sm.hidden-md, th.hidden-sm.hidden-md, td.hidden-sm.hidden-md { display: none !important; @@ -6750,12 +6698,8 @@ td.hidden-sm { } @media (min-width: 1200px) { - .hidden-sm.hidden-lg { - display: none !important; - } - tr.hidden-sm.hidden-lg { - display: none !important; - } + .hidden-sm.hidden-lg, + tr.hidden-sm.hidden-lg, th.hidden-sm.hidden-lg, td.hidden-sm.hidden-lg { display: none !important; @@ -6776,12 +6720,8 @@ td.hidden-md { } @media (max-width: 767px) { - .hidden-md.hidden-xs { - display: none !important; - } - tr.hidden-md.hidden-xs { - display: none !important; - } + .hidden-md.hidden-xs, + tr.hidden-md.hidden-xs, th.hidden-md.hidden-xs, td.hidden-md.hidden-xs { display: none !important; @@ -6789,12 +6729,8 @@ td.hidden-md { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm { - display: none !important; - } - tr.hidden-md.hidden-sm { - display: none !important; - } + .hidden-md.hidden-sm, + tr.hidden-md.hidden-sm, th.hidden-md.hidden-sm, td.hidden-md.hidden-sm { display: none !important; @@ -6802,12 +6738,8 @@ td.hidden-md { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-md { - display: none !important; - } - tr.hidden-md { - display: none !important; - } + .hidden-md, + tr.hidden-md, th.hidden-md, td.hidden-md { display: none !important; @@ -6815,12 +6747,8 @@ td.hidden-md { } @media (min-width: 1200px) { - .hidden-md.hidden-lg { - display: none !important; - } - tr.hidden-md.hidden-lg { - display: none !important; - } + .hidden-md.hidden-lg, + tr.hidden-md.hidden-lg, th.hidden-md.hidden-lg, td.hidden-md.hidden-lg { display: none !important; @@ -6841,12 +6769,8 @@ td.hidden-lg { } @media (max-width: 767px) { - .hidden-lg.hidden-xs { - display: none !important; - } - tr.hidden-lg.hidden-xs { - display: none !important; - } + .hidden-lg.hidden-xs, + tr.hidden-lg.hidden-xs, th.hidden-lg.hidden-xs, td.hidden-lg.hidden-xs { display: none !important; @@ -6854,12 +6778,8 @@ td.hidden-lg { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm { - display: none !important; - } - tr.hidden-lg.hidden-sm { - display: none !important; - } + .hidden-lg.hidden-sm, + tr.hidden-lg.hidden-sm, th.hidden-lg.hidden-sm, td.hidden-lg.hidden-sm { display: none !important; @@ -6867,12 +6787,8 @@ td.hidden-lg { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md { - display: none !important; - } - tr.hidden-lg.hidden-md { - display: none !important; - } + .hidden-lg.hidden-md, + tr.hidden-lg.hidden-md, th.hidden-lg.hidden-md, td.hidden-lg.hidden-md { display: none !important; @@ -6880,26 +6796,16 @@ td.hidden-lg { } @media (min-width: 1200px) { - .hidden-lg { - display: none !important; - } - tr.hidden-lg { - display: none !important; - } + .hidden-lg, + tr.hidden-lg, th.hidden-lg, td.hidden-lg { display: none !important; } } -.visible-print { - display: none !important; -} - -tr.visible-print { - display: none !important; -} - +.visible-print, +tr.visible-print, th.visible-print, td.visible-print { display: none !important; @@ -6916,12 +6822,8 @@ td.visible-print { td.visible-print { display: table-cell !important; } - .hidden-print { - display: none !important; - } - tr.hidden-print { - display: none !important; - } + .hidden-print, + tr.hidden-print, th.hidden-print, td.hidden-print { display: none !important; -- cgit v1.2.3 From 45b6c6de465bf9eb88e9a1726a21bb92e8e7f5c5 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 08:14:39 +0300 Subject: Run grunt dist. --- dist/css/bootstrap.css | 204 ++++++++++++++----------------------------------- 1 file changed, 59 insertions(+), 145 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c6490a40d..9371fde2c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,4 +1,11 @@ -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! +* Bootstrap v3.0.0 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, aside, @@ -26,7 +33,8 @@ audio:not([controls]) { height: 0; } -[hidden] { +[hidden], +template { display: none; } @@ -40,6 +48,10 @@ body { margin: 0; } +a { + background: transparent; +} + a:focus { outline: thin dotted; } @@ -4489,7 +4501,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #e6e6e6; + border-color: #e7e7e7; } .navbar-default .navbar-nav > .dropdown > a:hover .caret, @@ -6372,14 +6384,8 @@ body.modal-open, visibility: hidden !important; } -.visible-xs { - display: none !important; -} - -tr.visible-xs { - display: none !important; -} - +.visible-xs, +tr.visible-xs, th.visible-xs, td.visible-xs { display: none !important; @@ -6437,14 +6443,8 @@ td.visible-xs { } } -.visible-sm { - display: none !important; -} - -tr.visible-sm { - display: none !important; -} - +.visible-sm, +tr.visible-sm, th.visible-sm, td.visible-sm { display: none !important; @@ -6502,14 +6502,8 @@ td.visible-sm { } } -.visible-md { - display: none !important; -} - -tr.visible-md { - display: none !important; -} - +.visible-md, +tr.visible-md, th.visible-md, td.visible-md { display: none !important; @@ -6567,14 +6561,8 @@ td.visible-md { } } -.visible-lg { - display: none !important; -} - -tr.visible-lg { - display: none !important; -} - +.visible-lg, +tr.visible-lg, th.visible-lg, td.visible-lg { display: none !important; @@ -6646,12 +6634,8 @@ td.hidden-xs { } @media (max-width: 767px) { - .hidden-xs { - display: none !important; - } - tr.hidden-xs { - display: none !important; - } + .hidden-xs, + tr.hidden-xs, th.hidden-xs, td.hidden-xs { display: none !important; @@ -6659,12 +6643,8 @@ td.hidden-xs { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm { - display: none !important; - } - tr.hidden-xs.hidden-sm { - display: none !important; - } + .hidden-xs.hidden-sm, + tr.hidden-xs.hidden-sm, th.hidden-xs.hidden-sm, td.hidden-xs.hidden-sm { display: none !important; @@ -6672,12 +6652,8 @@ td.hidden-xs { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md { - display: none !important; - } - tr.hidden-xs.hidden-md { - display: none !important; - } + .hidden-xs.hidden-md, + tr.hidden-xs.hidden-md, th.hidden-xs.hidden-md, td.hidden-xs.hidden-md { display: none !important; @@ -6685,12 +6661,8 @@ td.hidden-xs { } @media (min-width: 1200px) { - .hidden-xs.hidden-lg { - display: none !important; - } - tr.hidden-xs.hidden-lg { - display: none !important; - } + .hidden-xs.hidden-lg, + tr.hidden-xs.hidden-lg, th.hidden-xs.hidden-lg, td.hidden-xs.hidden-lg { display: none !important; @@ -6711,12 +6683,8 @@ td.hidden-sm { } @media (max-width: 767px) { - .hidden-sm.hidden-xs { - display: none !important; - } - tr.hidden-sm.hidden-xs { - display: none !important; - } + .hidden-sm.hidden-xs, + tr.hidden-sm.hidden-xs, th.hidden-sm.hidden-xs, td.hidden-sm.hidden-xs { display: none !important; @@ -6724,12 +6692,8 @@ td.hidden-sm { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-sm { - display: none !important; - } - tr.hidden-sm { - display: none !important; - } + .hidden-sm, + tr.hidden-sm, th.hidden-sm, td.hidden-sm { display: none !important; @@ -6737,12 +6701,8 @@ td.hidden-sm { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md { - display: none !important; - } - tr.hidden-sm.hidden-md { - display: none !important; - } + .hidden-sm.hidden-md, + tr.hidden-sm.hidden-md, th.hidden-sm.hidden-md, td.hidden-sm.hidden-md { display: none !important; @@ -6750,12 +6710,8 @@ td.hidden-sm { } @media (min-width: 1200px) { - .hidden-sm.hidden-lg { - display: none !important; - } - tr.hidden-sm.hidden-lg { - display: none !important; - } + .hidden-sm.hidden-lg, + tr.hidden-sm.hidden-lg, th.hidden-sm.hidden-lg, td.hidden-sm.hidden-lg { display: none !important; @@ -6776,12 +6732,8 @@ td.hidden-md { } @media (max-width: 767px) { - .hidden-md.hidden-xs { - display: none !important; - } - tr.hidden-md.hidden-xs { - display: none !important; - } + .hidden-md.hidden-xs, + tr.hidden-md.hidden-xs, th.hidden-md.hidden-xs, td.hidden-md.hidden-xs { display: none !important; @@ -6789,12 +6741,8 @@ td.hidden-md { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm { - display: none !important; - } - tr.hidden-md.hidden-sm { - display: none !important; - } + .hidden-md.hidden-sm, + tr.hidden-md.hidden-sm, th.hidden-md.hidden-sm, td.hidden-md.hidden-sm { display: none !important; @@ -6802,12 +6750,8 @@ td.hidden-md { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-md { - display: none !important; - } - tr.hidden-md { - display: none !important; - } + .hidden-md, + tr.hidden-md, th.hidden-md, td.hidden-md { display: none !important; @@ -6815,12 +6759,8 @@ td.hidden-md { } @media (min-width: 1200px) { - .hidden-md.hidden-lg { - display: none !important; - } - tr.hidden-md.hidden-lg { - display: none !important; - } + .hidden-md.hidden-lg, + tr.hidden-md.hidden-lg, th.hidden-md.hidden-lg, td.hidden-md.hidden-lg { display: none !important; @@ -6841,12 +6781,8 @@ td.hidden-lg { } @media (max-width: 767px) { - .hidden-lg.hidden-xs { - display: none !important; - } - tr.hidden-lg.hidden-xs { - display: none !important; - } + .hidden-lg.hidden-xs, + tr.hidden-lg.hidden-xs, th.hidden-lg.hidden-xs, td.hidden-lg.hidden-xs { display: none !important; @@ -6854,12 +6790,8 @@ td.hidden-lg { } @media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm { - display: none !important; - } - tr.hidden-lg.hidden-sm { - display: none !important; - } + .hidden-lg.hidden-sm, + tr.hidden-lg.hidden-sm, th.hidden-lg.hidden-sm, td.hidden-lg.hidden-sm { display: none !important; @@ -6867,12 +6799,8 @@ td.hidden-lg { } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md { - display: none !important; - } - tr.hidden-lg.hidden-md { - display: none !important; - } + .hidden-lg.hidden-md, + tr.hidden-lg.hidden-md, th.hidden-lg.hidden-md, td.hidden-lg.hidden-md { display: none !important; @@ -6880,26 +6808,16 @@ td.hidden-lg { } @media (min-width: 1200px) { - .hidden-lg { - display: none !important; - } - tr.hidden-lg { - display: none !important; - } + .hidden-lg, + tr.hidden-lg, th.hidden-lg, td.hidden-lg { display: none !important; } } -.visible-print { - display: none !important; -} - -tr.visible-print { - display: none !important; -} - +.visible-print, +tr.visible-print, th.visible-print, td.visible-print { display: none !important; @@ -6916,12 +6834,8 @@ td.visible-print { td.visible-print { display: table-cell !important; } - .hidden-print { - display: none !important; - } - tr.hidden-print { - display: none !important; - } + .hidden-print, + tr.hidden-print, th.hidden-print, td.hidden-print { display: none !important; -- cgit v1.2.3 From ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Sep 2013 22:56:17 -0500 Subject: Fixes #10694: Remove unnecessary `content` property from `.caret` --- 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 de2a00185..b51a6c04f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3224,7 +3224,6 @@ input[type="button"].btn-block { border-right: 4px solid transparent; border-bottom: 0 dotted; border-left: 4px solid transparent; - content: ""; } .dropdown { -- cgit v1.2.3 From 000b445a042cc97d21d743ef917a35c23dde2a3e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 22 Sep 2013 09:19:37 -0500 Subject: Fixes #10755: Don't remove quotes around q element by default --- 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 4a78c468b..332110246 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -690,8 +690,6 @@ blockquote.pull-right small:after { content: '\00A0 \2014'; } -q:before, -q:after, blockquote:before, blockquote:after { content: ""; -- cgit v1.2.3 From b80f58b336cd7a4b59d704ff4c311cbf8edf5e51 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 22:34:36 -0700 Subject: run grunt dist --- dist/css/bootstrap.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 332110246..10c417d71 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,3 +1,10 @@ +/*! +* Bootstrap v3.0.0 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, @@ -3860,6 +3867,13 @@ 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; @@ -3967,6 +3981,13 @@ 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; } -- cgit v1.2.3 From 48f15faa5d7c23d4cb3a52a4d7c9a510633a2091 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 22:35:51 -0700 Subject: run grunt dist --- dist/css/bootstrap.css | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 10c417d71..574751aee 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2576,6 +2576,10 @@ input[type="button"].btn-block { content: "\e032"; } +.glyphicon-lock:before { + content: "\e033"; +} + .glyphicon-flag:before { content: "\e034"; } @@ -2616,10 +2620,18 @@ input[type="button"].btn-block { content: "\e043"; } +.glyphicon-bookmark:before { + content: "\e044"; +} + .glyphicon-print:before { content: "\e045"; } +.glyphicon-camera:before { + content: "\e046"; +} + .glyphicon-font:before { content: "\e047"; } @@ -2832,6 +2844,10 @@ input[type="button"].btn-block { content: "\e103"; } +.glyphicon-fire:before { + content: "\e104"; +} + .glyphicon-eye-open:before { content: "\e105"; } @@ -2848,6 +2864,10 @@ input[type="button"].btn-block { content: "\e108"; } +.glyphicon-calendar:before { + content: "\e109"; +} + .glyphicon-random:before { content: "\e110"; } @@ -2900,6 +2920,10 @@ input[type="button"].btn-block { content: "\e122"; } +.glyphicon-bell:before { + content: "\e123"; +} + .glyphicon-certificate:before { content: "\e124"; } @@ -2948,6 +2972,10 @@ input[type="button"].btn-block { content: "\e135"; } +.glyphicon-wrench:before { + content: "\e136"; +} + .glyphicon-tasks:before { content: "\e137"; } @@ -2956,6 +2984,10 @@ input[type="button"].btn-block { content: "\e138"; } +.glyphicon-briefcase:before { + content: "\e139"; +} + .glyphicon-fullscreen:before { content: "\e140"; } @@ -2964,6 +2996,10 @@ input[type="button"].btn-block { content: "\e141"; } +.glyphicon-paperclip:before { + content: "\e142"; +} + .glyphicon-heart-empty:before { content: "\e143"; } @@ -2976,6 +3012,10 @@ input[type="button"].btn-block { content: "\e145"; } +.glyphicon-pushpin:before { + content: "\e146"; +} + .glyphicon-usd:before { content: "\e148"; } @@ -3184,46 +3224,6 @@ input[type="button"].btn-block { content: "\e200"; } -.glyphicon-briefcase:before { - content: "\1f4bc"; -} - -.glyphicon-calendar:before { - content: "\1f4c5"; -} - -.glyphicon-pushpin:before { - content: "\1f4cc"; -} - -.glyphicon-paperclip:before { - content: "\1f4ce"; -} - -.glyphicon-camera:before { - content: "\1f4f7"; -} - -.glyphicon-lock:before { - content: "\1f512"; -} - -.glyphicon-bell:before { - content: "\1f514"; -} - -.glyphicon-bookmark:before { - content: "\1f516"; -} - -.glyphicon-fire:before { - content: "\1f525"; -} - -.glyphicon-wrench:before { - content: "\1f527"; -} - .caret { display: inline-block; width: 0; -- cgit v1.2.3 From b352061d1d005bd5ad1a17bec2353c851e014bc6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Oct 2013 11:37:47 -0500 Subject: run grunt --- dist/css/bootstrap.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 574751aee..9af2a9c0b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,10 +1,3 @@ -/*! -* Bootstrap v3.0.0 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 a32b626f5cce692be2cec6fe9b8cb630ec47634c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 1 Oct 2013 11:01:08 -0700 Subject: run up-to-date grunt --- 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 9af2a9c0b..574751aee 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,3 +1,10 @@ +/*! +* Bootstrap v3.0.0 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 c43462678cd0c561e075a536cc9796cabb1257c8 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Oct 2013 10:42:55 -0700 Subject: run grunt --- 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 574751aee..beea28d40 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,10 +1,10 @@ /*! -* Bootstrap v3.0.0 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.0 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 1adbe2043a0ab6adad95e823397f6444730dfb83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:32:23 -0500 Subject: Fixes #10959: round the .lead values down to nearest pixel via floor() --- 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 beea28d40..d91c9e38f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -390,7 +390,7 @@ p { .lead { margin-bottom: 20px; - font-size: 16.099999999999998px; + font-size: 16px; font-weight: 200; line-height: 1.4; } -- cgit v1.2.3 From 352532cd63a2d8e03ba7db806aa3bd110c023532 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:39:11 -0500 Subject: Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere --- dist/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d91c9e38f..35b69da70 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5731,12 +5731,6 @@ button.close { overflow: hidden; } -body.modal-open, -.modal-open .navbar-fixed-top, -.modal-open .navbar-fixed-bottom { - margin-right: 15px; -} - .modal { position: fixed; top: 0; -- cgit v1.2.3 From c814ad18333d7deefd3bff5446b02d6933f49f02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Oct 2013 22:00:37 -0700 Subject: Combine separate efforts for grid mixins into one, cleanup and reorganize --- dist/css/bootstrap.css | 801 +++++++++++++++++++++++++++++-------------------- 1 file changed, 477 insertions(+), 324 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 35b69da70..dc11c7221 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -805,52 +805,52 @@ pre code { } .col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, .col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, .col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, .col-lg-1, +.col-xs-2, +.col-sm-2, +.col-md-2, .col-lg-2, +.col-xs-3, +.col-sm-3, +.col-md-3, .col-lg-3, +.col-xs-4, +.col-sm-4, +.col-md-4, .col-lg-4, +.col-xs-5, +.col-sm-5, +.col-md-5, .col-lg-5, +.col-xs-6, +.col-sm-6, +.col-md-6, .col-lg-6, +.col-xs-7, +.col-sm-7, +.col-md-7, .col-lg-7, +.col-xs-8, +.col-sm-8, +.col-md-8, .col-lg-8, +.col-xs-9, +.col-sm-9, +.col-md-9, .col-lg-9, +.col-xs-10, +.col-sm-10, +.col-md-10, .col-lg-10, +.col-xs-11, +.col-sm-11, +.col-md-11, .col-lg-11, +.col-xs-12, +.col-sm-12, +.col-md-12, .col-lg-12 { position: relative; min-height: 1px; @@ -872,52 +872,196 @@ pre code { float: left; } -.col-xs-1 { - width: 8.333333333333332%; +.col-xs-12 { + width: 100%; } -.col-xs-2 { - width: 16.666666666666664%; +.col-xs-11 { + width: 91.66666666666666%; } -.col-xs-3 { - width: 25%; +.col-xs-10 { + width: 83.33333333333334%; } -.col-xs-4 { - width: 33.33333333333333%; +.col-xs-9 { + width: 75%; } -.col-xs-5 { - width: 41.66666666666667%; +.col-xs-8 { + width: 66.66666666666666%; +} + +.col-xs-7 { + width: 58.333333333333336%; } .col-xs-6 { width: 50%; } -.col-xs-7 { - width: 58.333333333333336%; +.col-xs-5 { + width: 41.66666666666667%; } -.col-xs-8 { - width: 66.66666666666666%; +.col-xs-4 { + width: 33.33333333333333%; } -.col-xs-9 { - width: 75%; +.col-xs-3 { + width: 25%; } -.col-xs-10 { - width: 83.33333333333334%; +.col-xs-2 { + width: 16.666666666666664%; } -.col-xs-11 { - width: 91.66666666666666%; +.col-xs-1 { + width: 8.333333333333332%; } -.col-xs-12 { - width: 100%; +.col-xs-pull-12 { + right: 100%; +} + +.col-xs-pull-11 { + right: 91.66666666666666%; +} + +.col-xs-pull-10 { + right: 83.33333333333334%; +} + +.col-xs-pull-9 { + right: 75%; +} + +.col-xs-pull-8 { + right: 66.66666666666666%; +} + +.col-xs-pull-7 { + right: 58.333333333333336%; +} + +.col-xs-pull-6 { + right: 50%; +} + +.col-xs-pull-5 { + right: 41.66666666666667%; +} + +.col-xs-pull-4 { + right: 33.33333333333333%; +} + +.col-xs-pull-3 { + right: 25%; +} + +.col-xs-pull-2 { + right: 16.666666666666664%; +} + +.col-xs-pull-1 { + right: 8.333333333333332%; +} + +.col-xs-push-12 { + left: 100%; +} + +.col-xs-push-11 { + left: 91.66666666666666%; +} + +.col-xs-push-10 { + left: 83.33333333333334%; +} + +.col-xs-push-9 { + left: 75%; +} + +.col-xs-push-8 { + left: 66.66666666666666%; +} + +.col-xs-push-7 { + left: 58.333333333333336%; +} + +.col-xs-push-6 { + left: 50%; +} + +.col-xs-push-5 { + left: 41.66666666666667%; +} + +.col-xs-push-4 { + left: 33.33333333333333%; +} + +.col-xs-push-3 { + left: 25%; +} + +.col-xs-push-2 { + left: 16.666666666666664%; +} + +.col-xs-push-1 { + left: 8.333333333333332%; +} + +.col-xs-offset-12 { + margin-left: 100%; +} + +.col-xs-offset-11 { + margin-left: 91.66666666666666%; +} + +.col-xs-offset-10 { + margin-left: 83.33333333333334%; +} + +.col-xs-offset-9 { + margin-left: 75%; +} + +.col-xs-offset-8 { + margin-left: 66.66666666666666%; +} + +.col-xs-offset-7 { + margin-left: 58.333333333333336%; +} + +.col-xs-offset-6 { + margin-left: 50%; +} + +.col-xs-offset-5 { + margin-left: 41.66666666666667%; +} + +.col-xs-offset-4 { + margin-left: 33.33333333333333%; +} + +.col-xs-offset-3 { + margin-left: 25%; +} + +.col-xs-offset-2 { + margin-left: 16.666666666666664%; +} + +.col-xs-offset-1 { + margin-left: 8.333333333333332%; } @media (min-width: 768px) { @@ -937,140 +1081,149 @@ pre code { .col-sm-11 { float: left; } - .col-sm-1 { - width: 8.333333333333332%; - } - .col-sm-2 { - width: 16.666666666666664%; + .col-sm-12 { + width: 100%; } - .col-sm-3 { - width: 25%; + .col-sm-11 { + width: 91.66666666666666%; } - .col-sm-4 { - width: 33.33333333333333%; + .col-sm-10 { + width: 83.33333333333334%; } - .col-sm-5 { - width: 41.66666666666667%; + .col-sm-9 { + width: 75%; } - .col-sm-6 { - width: 50%; + .col-sm-8 { + width: 66.66666666666666%; } .col-sm-7 { width: 58.333333333333336%; } - .col-sm-8 { - width: 66.66666666666666%; + .col-sm-6 { + width: 50%; } - .col-sm-9 { - width: 75%; + .col-sm-5 { + width: 41.66666666666667%; } - .col-sm-10 { - width: 83.33333333333334%; + .col-sm-4 { + width: 33.33333333333333%; } - .col-sm-11 { - width: 91.66666666666666%; + .col-sm-3 { + width: 25%; } - .col-sm-12 { - width: 100%; + .col-sm-2 { + width: 16.666666666666664%; } - .col-sm-push-1 { - left: 8.333333333333332%; + .col-sm-1 { + width: 8.333333333333332%; } - .col-sm-push-2 { - left: 16.666666666666664%; + .col-sm-pull-12 { + right: 100%; } - .col-sm-push-3 { - left: 25%; + .col-sm-pull-11 { + right: 91.66666666666666%; } - .col-sm-push-4 { - left: 33.33333333333333%; + .col-sm-pull-10 { + right: 83.33333333333334%; } - .col-sm-push-5 { - left: 41.66666666666667%; + .col-sm-pull-9 { + right: 75%; } - .col-sm-push-6 { - left: 50%; + .col-sm-pull-8 { + right: 66.66666666666666%; } - .col-sm-push-7 { - left: 58.333333333333336%; + .col-sm-pull-7 { + right: 58.333333333333336%; } - .col-sm-push-8 { - left: 66.66666666666666%; + .col-sm-pull-6 { + right: 50%; } - .col-sm-push-9 { - left: 75%; + .col-sm-pull-5 { + right: 41.66666666666667%; } - .col-sm-push-10 { - left: 83.33333333333334%; + .col-sm-pull-4 { + right: 33.33333333333333%; } - .col-sm-push-11 { - left: 91.66666666666666%; + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.666666666666664%; } .col-sm-pull-1 { right: 8.333333333333332%; } - .col-sm-pull-2 { - right: 16.666666666666664%; + .col-sm-push-12 { + left: 100%; } - .col-sm-pull-3 { - right: 25%; + .col-sm-push-11 { + left: 91.66666666666666%; } - .col-sm-pull-4 { - right: 33.33333333333333%; + .col-sm-push-10 { + left: 83.33333333333334%; } - .col-sm-pull-5 { - right: 41.66666666666667%; + .col-sm-push-9 { + left: 75%; } - .col-sm-pull-6 { - right: 50%; + .col-sm-push-8 { + left: 66.66666666666666%; } - .col-sm-pull-7 { - right: 58.333333333333336%; + .col-sm-push-7 { + left: 58.333333333333336%; } - .col-sm-pull-8 { - right: 66.66666666666666%; + .col-sm-push-6 { + left: 50%; } - .col-sm-pull-9 { - right: 75%; + .col-sm-push-5 { + left: 41.66666666666667%; } - .col-sm-pull-10 { - right: 83.33333333333334%; + .col-sm-push-4 { + left: 33.33333333333333%; } - .col-sm-pull-11 { - right: 91.66666666666666%; + .col-sm-push-3 { + left: 25%; } - .col-sm-offset-1 { - margin-left: 8.333333333333332%; + .col-sm-push-2 { + left: 16.666666666666664%; } - .col-sm-offset-2 { - margin-left: 16.666666666666664%; + .col-sm-push-1 { + left: 8.333333333333332%; } - .col-sm-offset-3 { - margin-left: 25%; + .col-sm-offset-12 { + margin-left: 100%; } - .col-sm-offset-4 { - margin-left: 33.33333333333333%; + .col-sm-offset-11 { + margin-left: 91.66666666666666%; } - .col-sm-offset-5 { - margin-left: 41.66666666666667%; + .col-sm-offset-10 { + margin-left: 83.33333333333334%; } - .col-sm-offset-6 { - margin-left: 50%; + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666666666666%; } .col-sm-offset-7 { margin-left: 58.333333333333336%; } - .col-sm-offset-8 { - margin-left: 66.66666666666666%; + .col-sm-offset-6 { + margin-left: 50%; } - .col-sm-offset-9 { - margin-left: 75%; + .col-sm-offset-5 { + margin-left: 41.66666666666667%; } - .col-sm-offset-10 { - margin-left: 83.33333333333334%; + .col-sm-offset-4 { + margin-left: 33.33333333333333%; } - .col-sm-offset-11 { - margin-left: 91.66666666666666%; + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.666666666666664%; + } + .col-sm-offset-1 { + margin-left: 8.333333333333332%; } } @@ -1091,149 +1244,149 @@ pre code { .col-md-11 { float: left; } - .col-md-1 { - width: 8.333333333333332%; - } - .col-md-2 { - width: 16.666666666666664%; + .col-md-12 { + width: 100%; } - .col-md-3 { - width: 25%; + .col-md-11 { + width: 91.66666666666666%; } - .col-md-4 { - width: 33.33333333333333%; + .col-md-10 { + width: 83.33333333333334%; } - .col-md-5 { - width: 41.66666666666667%; + .col-md-9 { + width: 75%; } - .col-md-6 { - width: 50%; + .col-md-8 { + width: 66.66666666666666%; } .col-md-7 { width: 58.333333333333336%; } - .col-md-8 { - width: 66.66666666666666%; - } - .col-md-9 { - width: 75%; + .col-md-6 { + width: 50%; } - .col-md-10 { - width: 83.33333333333334%; + .col-md-5 { + width: 41.66666666666667%; } - .col-md-11 { - width: 91.66666666666666%; + .col-md-4 { + width: 33.33333333333333%; } - .col-md-12 { - width: 100%; + .col-md-3 { + width: 25%; } - .col-md-push-0 { - left: auto; + .col-md-2 { + width: 16.666666666666664%; } - .col-md-push-1 { - left: 8.333333333333332%; + .col-md-1 { + width: 8.333333333333332%; } - .col-md-push-2 { - left: 16.666666666666664%; + .col-md-pull-12 { + right: 100%; } - .col-md-push-3 { - left: 25%; + .col-md-pull-11 { + right: 91.66666666666666%; } - .col-md-push-4 { - left: 33.33333333333333%; + .col-md-pull-10 { + right: 83.33333333333334%; } - .col-md-push-5 { - left: 41.66666666666667%; + .col-md-pull-9 { + right: 75%; } - .col-md-push-6 { - left: 50%; + .col-md-pull-8 { + right: 66.66666666666666%; } - .col-md-push-7 { - left: 58.333333333333336%; + .col-md-pull-7 { + right: 58.333333333333336%; } - .col-md-push-8 { - left: 66.66666666666666%; + .col-md-pull-6 { + right: 50%; } - .col-md-push-9 { - left: 75%; + .col-md-pull-5 { + right: 41.66666666666667%; } - .col-md-push-10 { - left: 83.33333333333334%; + .col-md-pull-4 { + right: 33.33333333333333%; } - .col-md-push-11 { - left: 91.66666666666666%; + .col-md-pull-3 { + right: 25%; } - .col-md-pull-0 { - right: auto; + .col-md-pull-2 { + right: 16.666666666666664%; } .col-md-pull-1 { right: 8.333333333333332%; } - .col-md-pull-2 { - right: 16.666666666666664%; + .col-md-push-12 { + left: 100%; } - .col-md-pull-3 { - right: 25%; + .col-md-push-11 { + left: 91.66666666666666%; } - .col-md-pull-4 { - right: 33.33333333333333%; + .col-md-push-10 { + left: 83.33333333333334%; } - .col-md-pull-5 { - right: 41.66666666666667%; + .col-md-push-9 { + left: 75%; } - .col-md-pull-6 { - right: 50%; + .col-md-push-8 { + left: 66.66666666666666%; } - .col-md-pull-7 { - right: 58.333333333333336%; + .col-md-push-7 { + left: 58.333333333333336%; } - .col-md-pull-8 { - right: 66.66666666666666%; + .col-md-push-6 { + left: 50%; } - .col-md-pull-9 { - right: 75%; + .col-md-push-5 { + left: 41.66666666666667%; } - .col-md-pull-10 { - right: 83.33333333333334%; + .col-md-push-4 { + left: 33.33333333333333%; } - .col-md-pull-11 { - right: 91.66666666666666%; + .col-md-push-3 { + left: 25%; } - .col-md-offset-0 { - margin-left: 0; + .col-md-push-2 { + left: 16.666666666666664%; } - .col-md-offset-1 { - margin-left: 8.333333333333332%; + .col-md-push-1 { + left: 8.333333333333332%; } - .col-md-offset-2 { - margin-left: 16.666666666666664%; + .col-md-offset-12 { + margin-left: 100%; } - .col-md-offset-3 { - margin-left: 25%; + .col-md-offset-11 { + margin-left: 91.66666666666666%; } - .col-md-offset-4 { - margin-left: 33.33333333333333%; + .col-md-offset-10 { + margin-left: 83.33333333333334%; } - .col-md-offset-5 { - margin-left: 41.66666666666667%; + .col-md-offset-9 { + margin-left: 75%; } - .col-md-offset-6 { - margin-left: 50%; + .col-md-offset-8 { + margin-left: 66.66666666666666%; } .col-md-offset-7 { margin-left: 58.333333333333336%; } - .col-md-offset-8 { - margin-left: 66.66666666666666%; + .col-md-offset-6 { + margin-left: 50%; } - .col-md-offset-9 { - margin-left: 75%; + .col-md-offset-5 { + margin-left: 41.66666666666667%; } - .col-md-offset-10 { - margin-left: 83.33333333333334%; + .col-md-offset-4 { + margin-left: 33.33333333333333%; } - .col-md-offset-11 { - margin-left: 91.66666666666666%; + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-2 { + margin-left: 16.666666666666664%; + } + .col-md-offset-1 { + margin-left: 8.333333333333332%; } } @@ -1254,149 +1407,149 @@ pre code { .col-lg-11 { float: left; } - .col-lg-1 { - width: 8.333333333333332%; - } - .col-lg-2 { - width: 16.666666666666664%; + .col-lg-12 { + width: 100%; } - .col-lg-3 { - width: 25%; + .col-lg-11 { + width: 91.66666666666666%; } - .col-lg-4 { - width: 33.33333333333333%; + .col-lg-10 { + width: 83.33333333333334%; } - .col-lg-5 { - width: 41.66666666666667%; + .col-lg-9 { + width: 75%; } - .col-lg-6 { - width: 50%; + .col-lg-8 { + width: 66.66666666666666%; } .col-lg-7 { width: 58.333333333333336%; } - .col-lg-8 { - width: 66.66666666666666%; - } - .col-lg-9 { - width: 75%; + .col-lg-6 { + width: 50%; } - .col-lg-10 { - width: 83.33333333333334%; + .col-lg-5 { + width: 41.66666666666667%; } - .col-lg-11 { - width: 91.66666666666666%; + .col-lg-4 { + width: 33.33333333333333%; } - .col-lg-12 { - width: 100%; + .col-lg-3 { + width: 25%; } - .col-lg-push-0 { - left: auto; + .col-lg-2 { + width: 16.666666666666664%; } - .col-lg-push-1 { - left: 8.333333333333332%; + .col-lg-1 { + width: 8.333333333333332%; } - .col-lg-push-2 { - left: 16.666666666666664%; + .col-lg-pull-12 { + right: 100%; } - .col-lg-push-3 { - left: 25%; + .col-lg-pull-11 { + right: 91.66666666666666%; } - .col-lg-push-4 { - left: 33.33333333333333%; + .col-lg-pull-10 { + right: 83.33333333333334%; } - .col-lg-push-5 { - left: 41.66666666666667%; + .col-lg-pull-9 { + right: 75%; } - .col-lg-push-6 { - left: 50%; + .col-lg-pull-8 { + right: 66.66666666666666%; } - .col-lg-push-7 { - left: 58.333333333333336%; + .col-lg-pull-7 { + right: 58.333333333333336%; } - .col-lg-push-8 { - left: 66.66666666666666%; + .col-lg-pull-6 { + right: 50%; } - .col-lg-push-9 { - left: 75%; + .col-lg-pull-5 { + right: 41.66666666666667%; } - .col-lg-push-10 { - left: 83.33333333333334%; + .col-lg-pull-4 { + right: 33.33333333333333%; } - .col-lg-push-11 { - left: 91.66666666666666%; + .col-lg-pull-3 { + right: 25%; } - .col-lg-pull-0 { - right: auto; + .col-lg-pull-2 { + right: 16.666666666666664%; } .col-lg-pull-1 { right: 8.333333333333332%; } - .col-lg-pull-2 { - right: 16.666666666666664%; + .col-lg-push-12 { + left: 100%; } - .col-lg-pull-3 { - right: 25%; + .col-lg-push-11 { + left: 91.66666666666666%; } - .col-lg-pull-4 { - right: 33.33333333333333%; + .col-lg-push-10 { + left: 83.33333333333334%; } - .col-lg-pull-5 { - right: 41.66666666666667%; + .col-lg-push-9 { + left: 75%; } - .col-lg-pull-6 { - right: 50%; + .col-lg-push-8 { + left: 66.66666666666666%; } - .col-lg-pull-7 { - right: 58.333333333333336%; + .col-lg-push-7 { + left: 58.333333333333336%; } - .col-lg-pull-8 { - right: 66.66666666666666%; + .col-lg-push-6 { + left: 50%; } - .col-lg-pull-9 { - right: 75%; + .col-lg-push-5 { + left: 41.66666666666667%; } - .col-lg-pull-10 { - right: 83.33333333333334%; + .col-lg-push-4 { + left: 33.33333333333333%; } - .col-lg-pull-11 { - right: 91.66666666666666%; + .col-lg-push-3 { + left: 25%; } - .col-lg-offset-0 { - margin-left: 0; + .col-lg-push-2 { + left: 16.666666666666664%; } - .col-lg-offset-1 { - margin-left: 8.333333333333332%; + .col-lg-push-1 { + left: 8.333333333333332%; } - .col-lg-offset-2 { - margin-left: 16.666666666666664%; + .col-lg-offset-12 { + margin-left: 100%; } - .col-lg-offset-3 { - margin-left: 25%; + .col-lg-offset-11 { + margin-left: 91.66666666666666%; } - .col-lg-offset-4 { - margin-left: 33.33333333333333%; + .col-lg-offset-10 { + margin-left: 83.33333333333334%; } - .col-lg-offset-5 { - margin-left: 41.66666666666667%; + .col-lg-offset-9 { + margin-left: 75%; } - .col-lg-offset-6 { - margin-left: 50%; + .col-lg-offset-8 { + margin-left: 66.66666666666666%; } .col-lg-offset-7 { margin-left: 58.333333333333336%; } - .col-lg-offset-8 { - margin-left: 66.66666666666666%; + .col-lg-offset-6 { + margin-left: 50%; } - .col-lg-offset-9 { - margin-left: 75%; + .col-lg-offset-5 { + margin-left: 41.66666666666667%; } - .col-lg-offset-10 { - margin-left: 83.33333333333334%; + .col-lg-offset-4 { + margin-left: 33.33333333333333%; } - .col-lg-offset-11 { - margin-left: 91.66666666666666%; + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-2 { + margin-left: 16.666666666666664%; + } + .col-lg-offset-1 { + margin-left: 8.333333333333332%; } } -- cgit v1.2.3 From 6c9ec3d87f400d77dbb598bff22b0e98a517e29c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:54:49 -0700 Subject: run grunt dist on .small additions --- dist/css/bootstrap.css | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 35b69da70..76ef7b477 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -495,7 +495,19 @@ h6 small, .h3 small, .h4 small, .h5 small, -.h6 small { +.h6 small, +h1 .small, +h2 .small, +h3 .small, +h4 .small, +h5 .small, +h6 .small, +.h1 .small, +.h2 .small, +.h3 .small, +.h4 .small, +.h5 .small, +.h6 .small { font-weight: normal; line-height: 1; color: #999999; @@ -510,7 +522,10 @@ h3 { h1 small, h2 small, -h3 small { +h3 small, +h1 .small, +h2 .small, +h3 .small { font-size: 65%; } @@ -523,7 +538,10 @@ h6 { h4 small, h5 small, -h6 small { +h6 small, +h4 .small, +h5 .small, +h6 .small { font-size: 75%; } @@ -685,15 +703,18 @@ blockquote.pull-right { } blockquote.pull-right p, -blockquote.pull-right small { +blockquote.pull-right small, +blockquote.pull-right .small { text-align: right; } -blockquote.pull-right small:before { +blockquote.pull-right small:before, +blockquote.pull-right .small:before { content: ''; } -blockquote.pull-right small:after { +blockquote.pull-right small:after, +blockquote.pull-right .small:after { content: '\00A0 \2014'; } @@ -744,7 +765,7 @@ pre code { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } .pre-scrollable { -- cgit v1.2.3 From 590975b4077ae6a2d5cba7d01403bbc09484bd6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:55:13 -0700 Subject: remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 --- 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 76ef7b477..2e958e32c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4088,13 +4088,11 @@ textarea.input-group-sm > .input-group-btn > .btn { clear: both; } -.tab-content > .tab-pane, -.pill-content > .pill-pane { +.tab-content > .tab-pane { display: none; } -.tab-content > .active, -.pill-content > .active { +.tab-content > .active { display: block; } -- cgit v1.2.3 From 6085973e258a50e829405b1c6cca743f7782017d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 18:56:31 -0700 Subject: drop .tabbable since it's unused and undocumented /cc #10102 --- dist/css/bootstrap.css | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 2e958e32c..9617a5ef1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4068,26 +4068,6 @@ textarea.input-group-sm > .input-group-btn > .btn { } } -.tabbable:before, -.tabbable:after { - display: table; - content: " "; -} - -.tabbable:after { - clear: both; -} - -.tabbable:before, -.tabbable:after { - display: table; - content: " "; -} - -.tabbable:after { - clear: both; -} - .tab-content > .tab-pane { display: none; } -- cgit v1.2.3 From 7bd955318ae9aeb989e1945f0834f15523a9cc15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:57:45 -0700 Subject: run grunt on that scaffolding 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 4d73dcb02..c03801299 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -380,7 +380,7 @@ hr { padding: 0; margin: -1px; overflow: hidden; - clip: rect(0 0 0 0); + clip: rect(0, 0, 0, 0); border: 0; } -- cgit v1.2.3 From 44b32a30366440b2127b343fbd1990fe15e88185 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:59:42 -0700 Subject: move .hidden to utilities; fixes #10997 --- dist/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c03801299..0b327b015 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6528,6 +6528,11 @@ button.close { border: 0; } +.hidden { + display: none !important; + visibility: hidden !important; +} + .affix { position: fixed; } @@ -6536,11 +6541,6 @@ button.close { width: device-width; } -.hidden { - display: none !important; - visibility: hidden !important; -} - .visible-xs, tr.visible-xs, th.visible-xs, -- cgit v1.2.3 From be4e951b7dc254dac08a5d2c6b88be0cda6e420f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:02:24 -0700 Subject: scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0b327b015..1d88c130a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2104,7 +2104,6 @@ textarea.input-lg { } .form-control-static { - padding-top: 7px; margin-bottom: 0; } @@ -2173,6 +2172,10 @@ textarea.input-lg { clear: both; } +.form-horizontal .form-control-static { + padding-top: 7px; +} + @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; -- cgit v1.2.3 From 5c64ef393caf1331129e2360e1b7f3aaf1e5150e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 10:58:12 -0700 Subject: fix .table-responsive media query; refs #11067 --- 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 1d88c130a..8df1f288a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1757,7 +1757,7 @@ table th[class*="col-"] { border-color: #f7e1b5; } -@media (max-width: 768px) { +@media (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; -- cgit v1.2.3 From 710071157751dc9aac1b531d283c1ae756a3c902 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Oct 2013 13:45:32 -0700 Subject: unnest the list-group-item link variation for #11085 and #11088 --- dist/css/bootstrap.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 1d88c130a..fd82f95c6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5524,24 +5524,24 @@ a.list-group-item:focus { background-color: #f5f5f5; } -.list-group-item.active, -.list-group-item.active:hover, -.list-group-item.active:focus { +a.list-group-item.active, +a.list-group-item.active:hover, +a.list-group-item.active:focus { z-index: 2; color: #ffffff; background-color: #428bca; border-color: #428bca; } -.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 { +a.list-group-item.active .list-group-item-heading, +a.list-group-item.active:hover .list-group-item-heading, +a.list-group-item.active:focus .list-group-item-heading { color: inherit; } -.list-group-item.active .list-group-item-text, -.list-group-item.active:hover .list-group-item-text, -.list-group-item.active:focus .list-group-item-text { +a.list-group-item.active .list-group-item-text, +a.list-group-item.active:hover .list-group-item-text, +a.list-group-item.active:focus .list-group-item-text { color: #e1edf7; } -- cgit v1.2.3 From e20b02ad0b1253c8e3d9703409a256927f55ede8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Yokomizo?= Date: Mon, 14 Oct 2013 20:10:49 -0300 Subject: extended hover state of linked versions of .thumbnail --- 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 c2ce5ec12..ca386026b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5214,7 +5214,8 @@ a.list-group-item.active > .badge, } a.thumbnail:hover, -a.thumbnail:focus { +a.thumbnail:focus, +a.thumbnail.active { border-color: #428bca; } -- cgit v1.2.3 From b05a287eb6d9cebe8590667ef260dd8ec70d5717 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 20:47:56 -0700 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 ca386026b..aa2951658 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2583,7 +2583,7 @@ input[type="button"].btn-block { @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { -- cgit v1.2.3 From 976f6dfdad663e43237a3da07cb64a41932f264e Mon Sep 17 00:00:00 2001 From: jeonghwan Date: Wed, 16 Oct 2013 23:20:34 +0900 Subject: Fixes issue #11122 -- navbar-fixed-bottom border Enable border-top in .navbar-fixed-bottom --- 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 aa2951658..20ea58e91 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4397,7 +4397,6 @@ textarea.input-group-sm > .input-group-btn > .btn { position: fixed; right: 0; left: 0; - border-width: 0 0 1px; } @media (min-width: 768px) { @@ -4410,11 +4409,13 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-fixed-top { top: 0; z-index: 1030; + border-width: 0 0 1px; } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; + border-width: 1px 0 0; } .navbar-brand { -- cgit v1.2.3 From 6a93a6b88a4b874fba5a1d1edd817cbd91ccfacc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 16:46:38 -0700 Subject: Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it --- 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 aa2951658..a6812e028 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -730,7 +730,7 @@ address { } code, -kdb, +kbd, pre, samp { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; @@ -6439,6 +6439,8 @@ button.close { margin: 1px; text-indent: -999px; cursor: pointer; + background-color: #000 \9; + background-color: rgba(0, 0, 0, 0); border: 1px solid #ffffff; border-radius: 10px; } -- cgit v1.2.3 From 291fd9828cdd50626b2b1afcc52122bfd9aecc08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 16:48:42 -0700 Subject: run 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 aa2951658..149a9aac8 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -730,7 +730,7 @@ address { } code, -kdb, +kbd, pre, samp { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; -- cgit v1.2.3 From f45c05a97a4dda6a657ff89fcbfa283308d0b329 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:40:19 -0700 Subject: fixes #11151: remove unused h5bp class from print CSS --- 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 149a9aac8..88ab70837 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -232,7 +232,6 @@ table { abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; -- cgit v1.2.3 From 23a85d6a7af6fdfdf59756515a760d332f51aa95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:59:15 -0700 Subject: fixes #11126: remove box-shadow from open dropdown toggle with .btn-link --- 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 8ced2d7e0..87996fa88 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3716,6 +3716,11 @@ input[type="button"].btn-block { box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } +.btn-group.open .dropdown-toggle.btn-link { + -webkit-box-shadow: none; + box-shadow: none; +} + .btn .caret { margin-left: 0; } -- cgit v1.2.3 From dd34102cb6bb601c3103f2c74804d2382271c0e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 19:54:22 -0700 Subject: Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline --- dist/css/bootstrap.css | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 87996fa88..4d49328bd 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2034,7 +2034,11 @@ textarea.input-lg { } .has-warning .help-block, -.has-warning .control-label { +.has-warning .control-label, +.has-warning .radio, +.has-warning .checkbox, +.has-warning .radio-inline, +.has-warning .checkbox-inline { color: #c09853; } @@ -2057,7 +2061,11 @@ textarea.input-lg { } .has-error .help-block, -.has-error .control-label { +.has-error .control-label, +.has-error .radio, +.has-error .checkbox, +.has-error .radio-inline, +.has-error .checkbox-inline { color: #b94a48; } @@ -2080,7 +2088,11 @@ textarea.input-lg { } .has-success .help-block, -.has-success .control-label { +.has-success .control-label, +.has-success .radio, +.has-success .checkbox, +.has-success .radio-inline, +.has-success .checkbox-inline { color: #468847; } -- cgit v1.2.3 From 5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:04:10 -0700 Subject: fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect --- 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 c8ff1ff18..71768f9a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5933,6 +5933,7 @@ button.close { } .modal-dialog { + position: relative; z-index: 1050; width: auto; padding: 10px; -- cgit v1.2.3 From e486bb4f39e79dd55b3c68af134a4624b2fa4c08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:30:16 -0700 Subject: Fixes #10433: Navbar z-index refactor * Resets the default navbar z-index to auto at a certain breakpoint * Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar) --- 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 71768f9a9..25e99925e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4294,6 +4294,7 @@ textarea.input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .navbar { + z-index: auto; border-radius: 4px; } } @@ -4413,6 +4414,7 @@ textarea.input-group-sm > .input-group-btn > .btn { position: fixed; right: 0; left: 0; + z-index: 1030; } @media (min-width: 768px) { @@ -4424,7 +4426,6 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-fixed-top { top: 0; - z-index: 1030; border-width: 0 0 1px; } -- cgit v1.2.3 From 76baacf2c94bec03273639ef0ed966dad87cf37a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 21:12:09 -0700 Subject: Remove default z-index on navbar and only set on static and fixed variants --- dist/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 25e99925e..b92a87a54 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4266,7 +4266,6 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar { position: relative; - z-index: 1000; min-height: 50px; margin-bottom: 20px; border: 1px solid transparent; @@ -4294,7 +4293,6 @@ textarea.input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .navbar { - z-index: auto; border-radius: 4px; } } @@ -4400,6 +4398,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .navbar-static-top { + z-index: 1000; border-width: 0 0 1px; } -- cgit v1.2.3