From c0ea077fb4890a4212e1c517d5fc2369beb49773 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 18:33:55 -0800 Subject: Revert the statis navbar in mobile views--they're back to being fixed all the time --- docs/assets/css/bootstrap.css | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b45d7e101..42ed6c702 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3170,9 +3170,21 @@ button.close { .navbar-fixed-top, .navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + z-index: 1030; border-radius: 0; } +.navbar-fixed-top { + top: 0; +} + +.navbar-fixed-bottom { + bottom: 0; +} + .navbar .brand { display: inline-block; padding: 7px 15px; @@ -3371,19 +3383,6 @@ button.close { .navbar-inverse .nav > .divider { border-right-color: #2f2f2f; } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - } - .navbar-fixed-top { - top: 0; - } - .navbar-fixed-bottom { - bottom: 0; - } .navbar .btn-navbar { display: none; } -- cgit v1.2.3 From 36aec5e484ae90fa427dae94814891d7d23f772c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 18:47:44 -0800 Subject: decrease top/bottom padding a bit in mobile fixed navbars --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 42ed6c702..0d99d6ea9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3124,7 +3124,7 @@ button.close { */ .navbar { - padding: 15px; + padding: 10px 15px; background-color: #eeeeee; border-radius: 4px; } -- cgit v1.2.3 From 82d059de87ff05511ba4de4a0e345f1f26de89f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 20:18:29 -0800 Subject: fix broken marketing section with updated class --- docs/assets/css/bootstrap.css | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0d99d6ea9..7fd15498e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3034,6 +3034,26 @@ button.close { border-bottom: 1px solid #ffffff; } +.tabbable:before, +.tabbable:after { + display: table; + content: " "; +} + +.tabbable:after { + clear: both; +} + +.tab-content > .tab-pane, +.pill-content > .pill-pane { + display: none; +} + +.tab-content > .active, +.pill-content > .active { + display: block; +} + /* // Prevent IE8 from misplacing imgs // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989 @@ -3101,26 +3121,6 @@ button.close { border-color: @grayLight; } - - -// Tabbable tabs -// ------------------------- - -// Clear any floats -.tabbable { - .clearfix(); -} - -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} - */ .navbar { -- cgit v1.2.3 From 53091be6d28c05f114bc0a2f74604ceb6f41845e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 20:26:21 -0800 Subject: remove unnecessary select border reset --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7fd15498e..c1d682426 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1135,10 +1135,6 @@ input[type="file"] { line-height: 34px; } -select { - border: 1px solid #cccccc; -} - select[multiple], select[size] { height: auto; -- cgit v1.2.3 From f6ec2c5dac371b0b1d56abd65be548ee5ed075c8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 21:06:20 -0800 Subject: Drop the recently added .counter class for .badge --- docs/assets/css/bootstrap.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c1d682426..db65570fc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4263,7 +4263,7 @@ a.thumbnail:focus { list-style: none; } -.counter { +.badge { display: inline-block; min-width: 10px; padding: 3px 7px; @@ -4278,33 +4278,33 @@ a.thumbnail:focus { border-radius: 10px; } -.counter:empty { +.badge:empty { display: none; } -a.counter:hover, -a.counter:focus { +a.badge:hover, +a.badge:focus { color: #fff; text-decoration: none; cursor: pointer; } -.btn .counter { +.btn .badge { position: relative; top: -1px; } -.btn-mini .counter { +.btn-mini .badge { top: 0; } -.nav-list > .active > a > .counter, -.nav-pills > .active > a > .counter { +.nav-list > .active > a > .badge, +.nav-pills > .active > a > .badge { color: #428bca; background-color: #fff; } -.nav-pills > li > a > .counter { +.nav-pills > li > a > .badge { margin-left: 3px; } -- cgit v1.2.3 From acdffe696cf29f51c659a18eeca304512ff47048 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 22:20:49 -0800 Subject: Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems --- docs/assets/css/bootstrap.css | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index db65570fc..cb8482a9f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4263,6 +4263,58 @@ a.thumbnail:focus { list-style: none; } +.label { + padding: .25em .6em; + font-size: 75%; + font-weight: 500; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: #999999; + border-radius: .25em; +} + +a.label:hover, +a.label:focus { + color: #fff; + text-decoration: none; + cursor: pointer; +} + +.label-danger { + background-color: #d9534f; +} + +.label-danger[href] { + background-color: #c9302c; +} + +.label-warning { + background-color: #f0ad4e; +} + +.label-warning[href] { + background-color: #ec971f; +} + +.label-success { + background-color: #5cb85c; +} + +.label-success[href] { + background-color: #449d44; +} + +.label-info { + background-color: #5bc0de; +} + +.label-info[href] { + background-color: #31b0d5; +} + .badge { display: inline-block; min-width: 10px; -- cgit v1.2.3 From 023568fe3dba59b7f5c12ac610e02fd8bd6c772f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 18 Feb 2013 01:28:35 -0800 Subject: Navbar realignment: * Change .brand to .navbar-brand * Change .btn-navbar to .navbar-toggle * Redesign navbar toggle to be a bit lighter and wider * Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering --- docs/assets/css/bootstrap.css | 61 ++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 21 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cb8482a9f..cdcd0f936 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3120,6 +3120,7 @@ button.close { */ .navbar { + position: relative; padding: 10px 15px; background-color: #eeeeee; border-radius: 4px; @@ -3160,7 +3161,6 @@ button.close { } .navbar-static-top { - position: static; border-radius: 0; } @@ -3181,40 +3181,51 @@ button.close { bottom: 0; } -.navbar .brand { - display: inline-block; +.navbar-brand { + display: block; + max-width: 200px; padding: 7px 15px; + margin-right: auto; + margin-left: auto; font-size: 18px; font-weight: 500; line-height: 20px; color: #777777; + text-align: center; } -.navbar .brand:hover, -.navbar .brand:focus { +.navbar-brand:hover, +.navbar-brand:focus { color: #5e5e5e; text-decoration: none; background-color: transparent; } -.btn-navbar { - float: right; - padding: 10px 12px; - background-color: #ddd; - border: 0; +.navbar-toggle { + position: absolute; + top: 10px; + right: 10px; + padding: 8px 12px; + background-color: transparent; + border: 1px solid #ddd; border-radius: 4px; } -.btn-navbar .icon-bar { +.navbar-toggle:hover, +.navbar-toggle:focus { + background-color: #ddd; +} + +.navbar-toggle .icon-bar { display: block; - width: 20px; + width: 22px; height: 2px; background-color: #fff; border-radius: 1px; } -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; +.navbar-toggle .icon-bar + .icon-bar { + margin-top: 4px; } .navbar .nav > .divider { @@ -3276,12 +3287,12 @@ button.close { background-color: #222222; } -.navbar-inverse .brand { +.navbar-inverse .navbar-brand { color: #999999; } -.navbar-inverse .brand:hover, -.navbar-inverse .brand:focus { +.navbar-inverse .navbar-brand:hover, +.navbar-inverse .navbar-brand:focus { color: #ffffff; background-color: transparent; } @@ -3307,8 +3318,13 @@ button.close { background-color: #080808; } -.navbar-inverse .btn-navbar { - background-color: #444; +.navbar-inverse .navbar-toggle { + border-color: #333; +} + +.navbar-inverse .navbar-toggle:hover, +.navbar-inverse .navbar-toggle:focus { + background-color: #333; } .navbar-inverse .nav > .divider { @@ -3345,7 +3361,7 @@ button.close { padding-top: 0; padding-bottom: 0; } - .navbar .brand { + .navbar-brand { float: left; padding-top: 15px; padding-bottom: 15px; @@ -3379,7 +3395,10 @@ button.close { .navbar-inverse .nav > .divider { border-right-color: #2f2f2f; } - .navbar .btn-navbar { + .navbar-toggle { + position: relative; + top: auto; + left: auto; display: none; } .nav-collapse.collapse { -- cgit v1.2.3 From e2e5580c0ebbc333590a685693dcaa6d97ef18e7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Feb 2013 00:44:15 -0800 Subject: nuke glyphicons changes in buttons for now because it's whack --- docs/assets/css/bootstrap.css | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cdcd0f936..19be8cfaa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1690,26 +1690,12 @@ fieldset[disabled] .btn { border-radius: 3px; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - .btn-mini { padding: 0 6px; font-size: 10.5px; border-radius: 3px; } -.btn [class^="glyphicon-"]::before { - vertical-align: -2px; -} - -.btn-small [class^="glyphicon-"]::before, -.btn-mini [class^="glyphicon-"]::before { - vertical-align: -1px; -} - .btn-block { display: block; width: 100%; -- cgit v1.2.3 From 9d763e805b3c6a042b8da04cb7a49d2d0748bdd9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 19:34:02 -0800 Subject: Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting --- docs/assets/css/bootstrap.css | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 19be8cfaa..e20f1a664 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3494,10 +3494,6 @@ button.close { border-radius: 0; } -.btn-group > .btn + .btn { - margin-left: 1px; -} - .btn-group > .btn:first-child { margin-left: 0; border-bottom-left-radius: 4px; @@ -3567,25 +3563,24 @@ button.close { border-radius: 0; } -.btn-group-vertical > .btn + .btn { - margin-top: 1px; - margin-left: 0; -} - .btn-group-vertical .btn:first-child { - border-radius: 4px 4px 0 0; + border-top-right-radius: 4px; + border-top-left-radius: 4px; } .btn-group-vertical .btn:last-child { - border-radius: 0 0 4px 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } .btn-group-vertical .btn-large:first-child { - border-radius: 6px 6px 0 0; + border-top-right-radius: 6px; + border-top-left-radius: 6px; } .btn-group-vertical .btn-large:last-child { - border-radius: 0 0 6px 6px; + border-bottom-right-radius: 6px; + border-bottom-left-radius: 6px; } .btn-group-justified { -- cgit v1.2.3 From 0dea8b0c7473c1db4aea7accfd0a68cbf09b9576 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 19:42:51 -0800 Subject: Fixes #6897: Print styles get own .less file --- docs/assets/css/bootstrap.css | 106 +++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e20f1a664..159cc5327 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,7 +1,7 @@ /*! * Bootstrap v3.0.0 * - * Copyright 2012 Twitter, Inc + * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * @@ -218,6 +218,58 @@ table { border-spacing: 0; } +@media print { + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} + html { font-size: 62.5%; -webkit-overflow-scrolling: touch; @@ -283,58 +335,6 @@ img { border-radius: 500px; } -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - p { margin: 0 0 10px; } -- cgit v1.2.3 From b19eb88b5abb7fd9dfc3aacc7ac3d296e1e98861 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 19:46:49 -0800 Subject: Fixes #6935: Use standard decimal points for .opacity() mixin --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 159cc5327..b0304d693 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3095,7 +3095,7 @@ button.close { .nav li.dropdown.open a:hover .caret { border-top-color: #fff; border-bottom-color: #fff; - .opacity(100); + .opacity(1); } // Dropdowns in stacked tabs @@ -3839,6 +3839,7 @@ button.close { .modal-backdrop.fade { opacity: 0; + filter: alpha(opacity=0); } .modal-backdrop.fade.in { -- cgit v1.2.3 From bfc4aaf6e84f20728258672276ccc9db84638082 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 21:19:02 -0800 Subject: Holy fucking shit fix that input group with buttons rounded corner noise --- docs/assets/css/bootstrap.css | 78 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 34 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b0304d693..299933d4b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1546,62 +1546,60 @@ select:focus:invalid:focus { border-left: 0; } -.input-group-btn, -.input-group-btn .btn { +.input-group-btn { + position: relative; white-space: nowrap; } .input-group-btn > .btn { + position: relative; float: left; border-radius: 0; } .input-group-btn > .btn + .btn { - border-left: 0; -} - -.input-group-btn.btn-group { - display: table-cell; -} - -.input-group-btn:first-child > .btn, -.input-group-btn.btn-group:first-child > .btn { - border-right: 0; + margin-left: -1px; } -.input-group-btn:first-child > .btn, -.input-group-btn.btn-group:first-child > .btn { - border-radius: 4px 0 0 4px; +.input-group-btn > .btn:hover, +.input-group-btn > .btn:active { + z-index: 2; } -.input-group-btn:first-child > .btn.btn-large, -.input-group-btn.btn-group:first-child > .btn.btn-large { - border-radius: 6px 0 0 6px; +.input-group-btn:first-child > .btn:first-child, +.input-group-btn:first-child > .dropdown-toggle:first-child { + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; } -.input-group-btn:first-child > .btn.btn-small, -.input-group-btn.btn-group:first-child > .btn.btn-small { - border-radius: 3px 0 0 3px; +.input-group-btn:first-child > .btn:first-child.btn-large, +.input-group-btn:first-child > .dropdown-toggle:first-child.btn-large { + border-bottom-left-radius: 6px; + border-top-left-radius: 6px; } -.input-group-btn:last-child > .btn, -.input-group-btn.btn-group:last-child > .btn:first-child { - border-left: 0; +.input-group-btn:first-child > .btn:first-child.btn-small, +.input-group-btn:first-child > .dropdown-toggle:first-child.btn-small { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; } -.input-group-btn:last-child > .btn, -.input-group-btn.btn-group:last-child > .btn { - border-radius: 0 4px 4px 0; +.input-group-btn:last-child > .btn:last-child, +.input-group-btn:last-child > .dropdown-toggle { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } -.input-group-btn:last-child > .btn.btn-large, -.input-group-btn.btn-group:last-child > .btn.btn-large { - border-radius: 0 6px 6px 0; +.input-group-btn:last-child > .btn:last-child.btn-large, +.input-group-btn:last-child > .dropdown-toggle.btn-large { + border-top-right-radius: 6px; + border-bottom-right-radius: 6px; } -.input-group-btn:last-child > .btn.btn-small, -.input-group-btn.btn-group:last-child > .btn.btn-small { - border-radius: 0 3px 3px 0; +.input-group-btn:last-child > .btn:last-child.btn-small, +.input-group-btn:last-child > .dropdown-toggle.btn-small { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } @media screen and (min-width: 768px) { @@ -1642,6 +1640,7 @@ select:focus:invalid:focus { font-weight: 500; line-height: 20px; text-align: center; + white-space: nowrap; vertical-align: middle; cursor: pointer; border: 1px solid #a7a9aa; @@ -3465,9 +3464,19 @@ button.close { } .btn-group > .btn { + position: relative; float: left; } +.btn-group > .btn + btn { + margin-left: -1px; +} + +.btn-group > .btn:hover, +.btn-group > .btn:active { + z-index: 2; +} + .btn-toolbar:before, .btn-toolbar:after { display: table; @@ -3560,15 +3569,16 @@ button.close { display: block; float: none; max-width: 100%; - border-radius: 0; } .btn-group-vertical .btn:first-child { + border-radius: 0; border-top-right-radius: 4px; border-top-left-radius: 4px; } .btn-group-vertical .btn:last-child { + border-radius: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } -- cgit v1.2.3 From 4418c82888745139d4adf0b5ecf8c5b1b3d3c39c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 22:47:32 -0800 Subject: Fixes #6954: properly reset grid classes within tables --- docs/assets/css/bootstrap.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 299933d4b..c078ea4af 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -975,11 +975,15 @@ th { background-color: #f5f5f5; } -table td[class*="span"], -table th[class*="span"] { +table col[class^="span"] { + display: table-column; + float: none; +} + +table td[class^="span"], +table th[class^="span"] { display: table-cell; float: none; - margin-left: 0; } .table tbody tr.success > td { -- cgit v1.2.3 From 5a30e52aac451369bf9a6abfc34c3c5d10b304d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 23:20:25 -0800 Subject: Fixes #6995: Add disabled navbar nav link support --- docs/assets/css/bootstrap.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c078ea4af..ba2b7d01b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2991,6 +2991,7 @@ button.close { .nav > .disabled > a:hover, .nav > .disabled > a:focus { + color: #999999; text-decoration: none; cursor: default; background-color: transparent; @@ -3149,6 +3150,13 @@ button.close { background-color: #d5d5d5; } +.navbar .nav > .disabled > a, +.navbar .nav > .disabled > a:hover, +.navbar .nav > .disabled > a:focus { + color: #cccccc; + background-color: transparent; +} + .navbar-static-top { border-radius: 0; } @@ -3307,6 +3315,13 @@ button.close { background-color: #080808; } +.navbar-inverse .nav > .disabled > a, +.navbar-inverse .nav > .disabled > a:hover, +.navbar-inverse .nav > .disabled > a:focus { + color: #444444; + background-color: transparent; +} + .navbar-inverse .navbar-toggle { border-color: #333; } -- cgit v1.2.3 From 38ba057dee025052c4a602b1295571e94b524a27 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 23:23:05 -0800 Subject: Fixes #6998: disabled background color properly on pagination --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ba2b7d01b..25878bcbb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3687,7 +3687,7 @@ button.close { .pagination > .disabled > a:focus { color: #999999; cursor: default; - background-color: transparent; + background-color: #ffffff; } .pagination > li:first-child > a, -- cgit v1.2.3 From 492c249537d7cdce6148ac8a1c056c4d89451fb2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Mar 2013 00:18:10 -0800 Subject: improve navbar toggle and hide code snippets on mobile devices for now --- docs/assets/css/bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 25878bcbb..3d6d8bf38 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3217,7 +3217,7 @@ button.close { display: block; width: 22px; height: 2px; - background-color: #fff; + background-color: #ccc; border-radius: 1px; } @@ -3331,6 +3331,10 @@ button.close { background-color: #333; } +.navbar-inverse .navbar-toggle .icon-bar { + background-color: #fff; +} + .navbar-inverse .nav > .divider { background-color: #151515; border-bottom-color: #2f2f2f; -- cgit v1.2.3 From 77e8e2aee9d560b9152ddb8f214da2aa6e03d516 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Mar 2013 00:50:08 -0800 Subject: Fix alignment of .navbar-brand --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3d6d8bf38..a76be141e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3373,7 +3373,7 @@ button.close { float: left; padding-top: 15px; padding-bottom: 15px; - margin-left: -15px; + margin-left: -10px; } .navbar .nav { float: left; -- cgit v1.2.3 From e0647e8273aee5bd09d5461f6f974e36b3d0c3c9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Mar 2013 12:37:36 -0800 Subject: nuke commented out unused var --- docs/assets/css/bootstrap.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a76be141e..501bb7df2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -8,11 +8,6 @@ * Designed and built with all the love in the world by @mdo and @fat. */ -/*@padding-large-input: 10px 14px; // 44px -// firefox hack since it doesn't accept custom line-height for inputs and automatically sets line-height as font-size + 4 px. -// input-large at 18 + 4 = 22, so I tried to compensate on padding. -*/ - /*! normalize.css v2.1.0 | MIT License | git.io/normalize */ article, -- cgit v1.2.3