From 3934d1b6c4cb975967235547b77e90b4c8c91be2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:08:04 -0800 Subject: rgba text color on active buttons for a bit more contrast from their non-active siblings --- docs/assets/css/bootstrap.css | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 861ef9141..002c937a0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 20:16:25 PST 2012 + * Date: Fri Jan 27 21:07:37 PST 2012 */ article, aside, @@ -2486,6 +2486,12 @@ table .span12 { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } +.btn.primary.active, +.btn.danger.active, +.btn.success.active, +.btn.info.active { + color: rgba(255, 255, 255, 0.75); +} .btn.primary { background-color: #0074cc; background-image: -moz-linear-gradient(top, #0088cc, #0055cc); @@ -2630,6 +2636,7 @@ table .span12 { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; + color: rgba(0, 0, 0, 0.5); } .btn.disabled, .btn[disabled] { cursor: default; @@ -2747,7 +2754,10 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius-bottomright: 6px; border-bottom-right-radius: 6px; } -.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active, +.btn-group .btn.active { z-index: 2; } .btn-group .dropdown-toggle { -- cgit v1.2.3 From 78120edf728ede35f2338b42ae30fff1bd7f086e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:20:58 -0800 Subject: add clearfix to control-group for longer labels and any other unforeseen circumstances --- docs/assets/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0ad058814..c097c8f58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -951,6 +951,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec } .form-horizontal .control-group { margin-bottom: 18px; + *zoom: 1; +} +.form-horizontal .control-group:before, .form-horizontal .control-group:after { + display: table; + content: ""; +} +.form-horizontal .control-group:after { + clear: both; } .form-horizontal .control-group > label { float: left; -- cgit v1.2.3 From ad78caa72639aa377caf584efc26fe7a5682b15c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 21:25:35 -0800 Subject: fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c097c8f58..d9e8213dc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2100,6 +2100,7 @@ table .span12 { color: #ffffff; } .navbar .nav.pull-right .dropdown-menu { + left: auto; right: 0; } .navbar .nav.pull-right .dropdown-menu:before { -- cgit v1.2.3