From 80e86442308b2cc86ba948de87e854057933e3ab Mon Sep 17 00:00:00 2001 From: Martynas Date: Sat, 5 Oct 2013 13:55:26 +0300 Subject: removed outline from modal --- 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 beea28d40..e56a3308b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5747,6 +5747,7 @@ body.modal-open, display: none; overflow: auto; overflow-y: scroll; + outline: 0; } .modal.fade .modal-dialog { -- cgit v1.2.3 From aad447e29075b52a46931be17a9be4016cc89ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 7 Nov 2013 20:58:17 +0100 Subject: Fix #11400 and #11431 --- dist/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6aef1f6fd..a7a5a25c1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4031,10 +4031,18 @@ textarea.input-group-sm > .input-group-btn > .btn { position: relative; } +.input-group-btn > .btn:not(:first-of-type):not(:last-of-type) { + border-radius: 0; +} + .input-group-btn > .btn + .btn { margin-left: -4px; } +.input-group-btn > .btn + .btn:last-of-type { + margin-left: -5px; +} + .input-group-btn > .btn:hover, .input-group-btn > .btn:active { z-index: 2; -- cgit v1.2.3 From 2b56ff04614c4617355d16c14784654e841bcf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 31 Oct 2013 10:32:23 +0100 Subject: Reduce size of the visibility styles --- dist/css/bootstrap.css | 319 +------------------------------------------------ 1 file changed, 3 insertions(+), 316 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9da8d0432..48cb46b2c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6620,45 +6620,6 @@ td.visible-xs { } } -@media (min-width: 768px) and (max-width: 991px) { - .visible-xs.visible-sm { - display: block !important; - } - tr.visible-xs.visible-sm { - display: table-row !important; - } - th.visible-xs.visible-sm, - td.visible-xs.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-xs.visible-md { - display: block !important; - } - tr.visible-xs.visible-md { - display: table-row !important; - } - th.visible-xs.visible-md, - td.visible-xs.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-xs.visible-lg { - display: block !important; - } - tr.visible-xs.visible-lg { - display: table-row !important; - } - th.visible-xs.visible-lg, - td.visible-xs.visible-lg { - display: table-cell !important; - } -} - .visible-sm, tr.visible-sm, th.visible-sm, @@ -6666,19 +6627,6 @@ td.visible-sm { display: none !important; } -@media (max-width: 767px) { - .visible-sm.visible-xs { - display: block !important; - } - tr.visible-sm.visible-xs { - display: table-row !important; - } - th.visible-sm.visible-xs, - td.visible-sm.visible-xs { - display: table-cell !important; - } -} - @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; @@ -6692,32 +6640,6 @@ td.visible-sm { } } -@media (min-width: 992px) and (max-width: 1199px) { - .visible-sm.visible-md { - display: block !important; - } - tr.visible-sm.visible-md { - display: table-row !important; - } - th.visible-sm.visible-md, - td.visible-sm.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-sm.visible-lg { - display: block !important; - } - tr.visible-sm.visible-lg { - display: table-row !important; - } - th.visible-sm.visible-lg, - td.visible-sm.visible-lg { - display: table-cell !important; - } -} - .visible-md, tr.visible-md, th.visible-md, @@ -6725,32 +6647,6 @@ td.visible-md { display: none !important; } -@media (max-width: 767px) { - .visible-md.visible-xs { - display: block !important; - } - tr.visible-md.visible-xs { - display: table-row !important; - } - th.visible-md.visible-xs, - td.visible-md.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-md.visible-sm { - display: block !important; - } - tr.visible-md.visible-sm { - display: table-row !important; - } - th.visible-md.visible-sm, - td.visible-md.visible-sm { - display: table-cell !important; - } -} - @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; @@ -6764,19 +6660,6 @@ td.visible-md { } } -@media (min-width: 1200px) { - .visible-md.visible-lg { - display: block !important; - } - tr.visible-md.visible-lg { - display: table-row !important; - } - th.visible-md.visible-lg, - td.visible-md.visible-lg { - display: table-cell !important; - } -} - .visible-lg, tr.visible-lg, th.visible-lg, @@ -6784,45 +6667,6 @@ td.visible-lg { display: none !important; } -@media (max-width: 767px) { - .visible-lg.visible-xs { - display: block !important; - } - tr.visible-lg.visible-xs { - display: table-row !important; - } - th.visible-lg.visible-xs, - td.visible-lg.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-lg.visible-sm { - display: block !important; - } - tr.visible-lg.visible-sm { - display: table-row !important; - } - th.visible-lg.visible-sm, - td.visible-lg.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-lg.visible-md { - display: block !important; - } - tr.visible-lg.visible-md { - display: table-row !important; - } - th.visible-lg.visible-md, - td.visible-lg.visible-md { - display: table-cell !important; - } -} - @media (min-width: 1200px) { .visible-lg { display: block !important; @@ -6836,19 +6680,6 @@ td.visible-lg { } } -.hidden-xs { - display: block !important; -} - -tr.hidden-xs { - display: table-row !important; -} - -th.hidden-xs, -td.hidden-xs { - display: table-cell !important; -} - @media (max-width: 767px) { .hidden-xs, tr.hidden-xs, @@ -6858,55 +6689,6 @@ td.hidden-xs { } } -@media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm, - tr.hidden-xs.hidden-sm, - th.hidden-xs.hidden-sm, - td.hidden-xs.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md, - tr.hidden-xs.hidden-md, - th.hidden-xs.hidden-md, - td.hidden-xs.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-xs.hidden-lg, - tr.hidden-xs.hidden-lg, - th.hidden-xs.hidden-lg, - td.hidden-xs.hidden-lg { - display: none !important; - } -} - -.hidden-sm { - display: block !important; -} - -tr.hidden-sm { - display: table-row !important; -} - -th.hidden-sm, -td.hidden-sm { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-sm.hidden-xs, - tr.hidden-sm.hidden-xs, - th.hidden-sm.hidden-xs, - td.hidden-sm.hidden-xs { - display: none !important; - } -} - @media (min-width: 768px) and (max-width: 991px) { .hidden-sm, tr.hidden-sm, @@ -6916,55 +6698,6 @@ td.hidden-sm { } } -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md, - tr.hidden-sm.hidden-md, - th.hidden-sm.hidden-md, - td.hidden-sm.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-sm.hidden-lg, - tr.hidden-sm.hidden-lg, - th.hidden-sm.hidden-lg, - td.hidden-sm.hidden-lg { - display: none !important; - } -} - -.hidden-md { - display: block !important; -} - -tr.hidden-md { - display: table-row !important; -} - -th.hidden-md, -td.hidden-md { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-md.hidden-xs, - tr.hidden-md.hidden-xs, - th.hidden-md.hidden-xs, - td.hidden-md.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm, - tr.hidden-md.hidden-sm, - th.hidden-md.hidden-sm, - td.hidden-md.hidden-sm { - display: none !important; - } -} - @media (min-width: 992px) and (max-width: 1199px) { .hidden-md, tr.hidden-md, @@ -6974,55 +6707,6 @@ td.hidden-md { } } -@media (min-width: 1200px) { - .hidden-md.hidden-lg, - tr.hidden-md.hidden-lg, - th.hidden-md.hidden-lg, - td.hidden-md.hidden-lg { - display: none !important; - } -} - -.hidden-lg { - display: block !important; -} - -tr.hidden-lg { - display: table-row !important; -} - -th.hidden-lg, -td.hidden-lg { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-lg.hidden-xs, - tr.hidden-lg.hidden-xs, - th.hidden-lg.hidden-xs, - td.hidden-lg.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm, - tr.hidden-lg.hidden-sm, - th.hidden-lg.hidden-sm, - td.hidden-lg.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md, - tr.hidden-lg.hidden-md, - th.hidden-lg.hidden-md, - td.hidden-lg.hidden-md { - display: none !important; - } -} - @media (min-width: 1200px) { .hidden-lg, tr.hidden-lg, @@ -7050,6 +6734,9 @@ td.visible-print { td.visible-print { display: table-cell !important; } +} + +@media print { .hidden-print, tr.hidden-print, th.hidden-print, -- cgit v1.2.3 From 37b2c8a812337a6ed9324ba2e5dab9afbc5ad3ce Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Fri, 13 Dec 2013 12:27:56 +0100 Subject: add dist files. --- dist/css/bootstrap.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 261fc46de..c956113e2 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4890,7 +4890,7 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1040; + z-index: 1050; display: none; overflow: auto; overflow-y: scroll; @@ -4911,7 +4911,6 @@ button.close { } .modal-dialog { position: relative; - z-index: 1050; width: auto; margin: 10px; } @@ -4932,7 +4931,7 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1030; + z-index: 1040; background-color: #000; } .modal-backdrop.fade { -- cgit v1.2.3 From 22820d7151fa155a4e083bf6c940a52e55138735 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Dec 2013 23:06:04 -0800 Subject: Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS --- 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 261fc46de..0473ef37c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3618,6 +3618,11 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-brand:focus { text-decoration: none; } +.navbar-brand > .glyphicon { + float: left; + margin-top: -2px; + margin-right: 5px; +} @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { -- cgit v1.2.3 From 11c6ab767cab5384188a301f7c9366b212432e81 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 13:22:56 -0800 Subject: Fixes #10370: Improved and deprecated dropdown menu alignment options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Removes an old pair of selectors that didn’t properly target the right-aligned navbar alignment of dropdown menus. * Deprecates the `.pull-right` alignment in favor of a more specific and unique class name. * Adds `.dropdown-menu-right` as the new alignment class. This is then mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for auto-alignment. * To override that auto-alignment, use `.dropdown-menu-left` as needed. --- dist/css/bootstrap.css | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 45f868ca5..ef2293133 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2965,6 +2965,14 @@ input[type="button"].btn-block { .open > a { outline: 0; } +.dropdown-menu-right { + right: 0; + left: auto; +} +.dropdown-menu-left { + right: auto; + left: 0; +} .dropdown-header { display: block; padding: 3px 20px; @@ -3001,6 +3009,10 @@ input[type="button"].btn-block { right: 0; left: auto; } + .navbar-right .dropdown-menu-left { + right: auto; + left: 0; + } } .btn-group, .btn-group-vertical { @@ -3776,11 +3788,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.navbar-nav.pull-right > li > .dropdown-menu, -.navbar-nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} .navbar-btn { margin-top: 8px; margin-bottom: 8px; -- cgit v1.2.3 From 544b8ecab78c322bf826797374c0b10279cedf1f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 16:03:21 -0800 Subject: Fixes #10921: Add support for input groups within button toolbars * Floats any `.input-group` within a toolbar * Simplifies the CSS to remove sibling selectors and instead use a negative amrgin on the parent with only `margin-left` See it in action: http://jsbin.com/aGEcUqAT/1/. --- dist/css/bootstrap.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 436e8e6a0..10c025bc9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3045,13 +3045,16 @@ input[type="button"].btn-block { .btn-group .btn-group + .btn-group { margin-left: -1px; } -.btn-toolbar .btn-group { +.btn-toolbar { + margin-left: -5px; +} +.btn-toolbar .btn-group, +.btn-toolbar .input-group { float: left; } -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group, -.btn-toolbar > .btn-group + .btn-group { +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { margin-left: 5px; } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { -- cgit v1.2.3 From 432b9f9cde8e2b067fd54ed148c5f8df510e30c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 20:04:12 -0800 Subject: Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows --- 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 3d53a6aef..c868d7585 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3208,6 +3208,7 @@ input[type="button"].btn-block { padding-left: 0; } .input-group .form-control { + float: left; width: 100%; margin-bottom: 0; } -- cgit v1.2.3 From 072ccd4ddad1dcf642e27497c5253ce578182719 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 21:40:16 -0800 Subject: Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs --- dist/css/bootstrap.css | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c868d7585..c3027b3a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -450,6 +450,18 @@ small, cite { font-style: normal; } +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.text-justify { + text-align: justify; +} .text-muted { color: #999; } @@ -483,17 +495,36 @@ cite { .text-info:hover { color: #245269; } -.text-left { - text-align: left; +.bg-primary { + color: #fff; + background-color: #428bca; } -.text-right { - text-align: right; +a.bg-primary:hover { + background-color: #3071a9; } -.text-center { - text-align: center; +.bg-warning { + background-color: #fcf8e3; } -.text-justify { - text-align: justify; +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; +} +.bg-success { + background-color: #dff0d8; +} +a.bg-success:hover { + background-color: #c1e2b3; +} +.bg-info { + background-color: #d9edf7; +} +a.bg-info:hover { + background-color: #afd9ee; } .page-header { padding-bottom: 9px; -- cgit v1.2.3 From 168469f545a189fa51e5d36546e7972f4748ec3f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 21:50:47 -0800 Subject: Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class --- dist/css/bootstrap.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c3027b3a9..4c1d7baba 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4278,19 +4278,17 @@ a.list-group-item.active > .badge, .jumbotron { padding: 30px; margin-bottom: 30px; - font-size: 21px; - font-weight: 200; - line-height: 2.1428571435; color: inherit; background-color: #eee; } .jumbotron h1, .jumbotron .h1 { - line-height: 1; color: inherit; } .jumbotron p { - line-height: 1.4; + margin-bottom: 15px; + font-size: 21px; + font-weight: 200; } .container .jumbotron { border-radius: 6px; -- cgit v1.2.3