From 452d8c1df0fe75acfc9431a0b0f349f85a6c1fd1 Mon Sep 17 00:00:00 2001 From: David Hirtle Date: Fri, 4 May 2012 13:50:16 -0700 Subject: Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params --- 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 f13cad826..073d48999 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2585,7 +2585,7 @@ button.close { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2726,7 +2726,7 @@ button.close { background-repeat: repeat-x; border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0055cc', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2756,7 +2756,7 @@ button.close { background-repeat: repeat-x; border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2786,7 +2786,7 @@ button.close { background-repeat: repeat-x; border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2816,7 +2816,7 @@ button.close { background-repeat: repeat-x; border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2846,7 +2846,7 @@ button.close { background-repeat: repeat-x; border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2876,7 +2876,7 @@ button.close { background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -3571,7 +3571,7 @@ input[type="submit"].btn.btn-mini { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0); -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); @@ -3831,7 +3831,7 @@ input[type="submit"].btn.btn-mini { background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -3962,7 +3962,7 @@ input[type="submit"].btn.btn-mini { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff5f5f5', GradientType=0); -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -4626,7 +4626,7 @@ a.badge:hover { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -4647,19 +4647,19 @@ a.badge:hover { background-image: linear-gradient(top, #149bdf, #0480be); background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .progress-striped .bar { @@ -4693,7 +4693,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } .progress-danger.progress-striped .bar { @@ -4715,7 +4715,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } .progress-success.progress-striped .bar { @@ -4737,7 +4737,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } .progress-info.progress-striped .bar { @@ -4759,7 +4759,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #fbb450, #f89406); background-image: linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } .progress-warning.progress-striped .bar { -- cgit v1.2.3 From 10c6db4b14e5eb26bd663996233e3ac3075d5cb4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 16 May 2012 19:43:22 -0700 Subject: add proper role to dialog markup and cleanup modal logging --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 42d1907d6..cd7fe2f99 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4643,15 +4643,15 @@ a.badge:hover { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .progress-striped .bar { -- cgit v1.2.3 From a7b49a7d92a0efa640179b775e309002afc50390 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 17 May 2012 00:23:11 -0700 Subject: nearly everything working with activedescendant... then decide it's wrong. --- docs/assets/css/bootstrap.css | 21 ++++++++++++++++++--- 1 file changed, 18 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 cd7fe2f99..82cb98b59 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2355,12 +2355,17 @@ table .span24 { margin-left: 2px; } -.dropdown:hover .caret, +.dropdown a:focus .caret, +.dropdown a:hover .caret, .open .caret { opacity: 1; filter: alpha(opacity=100); } +.navbar .nav .open > a { + color: #ffffff; +} + .dropdown-menu { position: absolute; top: 100%; @@ -2415,12 +2420,19 @@ table .span24 { .dropdown-menu li > a:hover, .dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu .active > a:hover, +.dropdown-menu:hover #aria-active > a:hover, +.dropdown-menu #aria-active > a { color: #ffffff; text-decoration: none; background-color: #0088cc; } +.dropdown-menu:hover #aria-active > a { + color: #333333; + background-color: #ffffff; +} + .open { *z-index: 1000; } @@ -3779,6 +3791,7 @@ input[type="submit"].btn.btn-mini { margin: 0; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { color: #ffffff; text-decoration: none; @@ -3786,7 +3799,8 @@ input[type="submit"].btn.btn-mini { } .navbar .nav .active > a, -.navbar .nav .active > a:hover { +.navbar .nav .active > a:hover, +.navbar .nav .active > a:focus { color: #ffffff; text-decoration: none; background-color: #222222; @@ -3916,6 +3930,7 @@ input[type="submit"].btn.btn-mini { background-color: transparent; } +.navbar .nav li.dropdown.active > .dropdown-toggle:focus, .navbar .nav li.dropdown.active > .dropdown-toggle:hover { color: #ffffff; } -- cgit v1.2.3 From 9889948f5851f5ce19668073b1f88eb4b6082ea6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 17 May 2012 00:39:14 -0700 Subject: abandon activedescendant because it was awful --- docs/assets/css/bootstrap.css | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 82cb98b59..eed701c12 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2419,18 +2419,13 @@ table .span24 { } .dropdown-menu li > a:hover, +.dropdown-menu li > a:focus, .dropdown-menu .active > a, -.dropdown-menu .active > a:hover, -.dropdown-menu:hover #aria-active > a:hover, -.dropdown-menu #aria-active > a { +.dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0088cc; -} - -.dropdown-menu:hover #aria-active > a { - color: #333333; - background-color: #ffffff; + outline: 0; } .open { -- cgit v1.2.3 From ad9bfeef7a27cb470f520798cd806cb310f4e9c8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Jun 2012 22:34:20 -0700 Subject: fix cut off icons --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0bd063ee7..23dbd76fc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2229,6 +2229,7 @@ table .span24 { } .icon-random { + width: 16px; background-position: -216px -120px; } @@ -2261,6 +2262,7 @@ table .span24 { } .icon-folder-open { + width: 16px; background-position: -408px -120px; } -- cgit v1.2.3 From eb3a4b8f759299e4157bd32deb6016587f48acb4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 08:33:42 -0700 Subject: fix placeholder for FF by attaching input and textarea when we call the mixin --- docs/assets/css/bootstrap.css | 9 ++++++--- 1 file changed, 6 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 23dbd76fc..e7e270614 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1232,15 +1232,18 @@ select:focus:required:invalid:focus { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); } -:-moz-placeholder { +input:-moz-placeholder, +textarea:-moz-placeholder { color: #999999; } -:-ms-input-placeholder { +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { color: #999999; } -::-webkit-input-placeholder { +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { color: #999999; } -- cgit v1.2.3 From 5563b8448eb4472743605cb006473387ebf1529a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 08:45:51 -0700 Subject: fix #3693: rounded corners on search form --- 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 e7e270614..ed8002e20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1387,7 +1387,7 @@ textarea::-webkit-input-placeholder { border-radius: 0 3px 3px 0; } -.search-query { +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; -- cgit v1.2.3 From eef87c96afb281e343b9ad6345220b41457a85d7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 20:27:42 -0700 Subject: #3684: reset width to auto for input type='image' --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a9cd5ae4a..fe957d19f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -873,6 +873,7 @@ input[type="checkbox"] { cursor: pointer; } +input[type="image"], input[type="submit"], input[type="reset"], input[type="button"], -- cgit v1.2.3 From f2e39233f54a733df54d5d998abd79233e0f143f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 10 Jun 2012 15:12:02 -0700 Subject: rewrite alerts and progress bars sections --- 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 fe957d19f..9803e2a6a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3169,10 +3169,6 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } -.alert-heading { - color: inherit; -} - .alert .close { position: relative; top: -2px; -- cgit v1.2.3 From b1cb5565039f492766fdfd727f776f3e9dfa7e45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 14 Jun 2012 11:56:46 -0700 Subject: improve inline-block of append/prepend inputs with font-size: 0; --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9803e2a6a..838d5a611 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1269,6 +1269,7 @@ textarea::-webkit-input-placeholder { .input-prepend, .input-append { margin-bottom: 5px; + font-size: 0; } .input-prepend input, @@ -1280,6 +1281,7 @@ textarea::-webkit-input-placeholder { position: relative; margin-bottom: 0; *margin-left: 0; + font-size: 13px; vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -1307,6 +1309,7 @@ textarea::-webkit-input-placeholder { height: 18px; min-width: 16px; padding: 4px 5px; + font-size: 13px; font-weight: normal; line-height: 18px; text-align: center; -- cgit v1.2.3 From d14f06fc4ed3f4753de9ae5ef247c48629714935 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 13:25:35 -0700 Subject: round select list corners --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 838d5a611..81fb023d9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -795,6 +795,9 @@ input[type="color"], font-size: 13px; line-height: 18px; color: #555555; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } input, @@ -824,9 +827,6 @@ input[type="color"], .uneditable-input { background-color: #ffffff; border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -- cgit v1.2.3 From 64ba423b6d06c98e95e23d8c34df62a47a421a03 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 13:52:07 -0700 Subject: #2764: add disabled styles to navs and dropdowns --- docs/assets/css/bootstrap.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 81fb023d9..3389eb403 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2466,6 +2466,17 @@ table .span24 { outline: 0; } +.dropdown-menu .disabled > a, +.dropdown-menu .disabled > a:hover { + color: #999999; +} + +.dropdown-menu .disabled > a:hover { + text-decoration: none; + cursor: default; + background-color: transparent; +} + .open { *z-index: 1000; } @@ -3580,6 +3591,16 @@ input[type="submit"].btn.btn-mini { *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} + +.nav > .disabled > a:hover { + text-decoration: none; + cursor: default; + background-color: transparent; +} + .navbar { *position: relative; *z-index: 2; -- cgit v1.2.3 From b54264cde0b1e72fbb463e4aa272ed1c2876bd02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 14:42:46 -0700 Subject: add basic vertical button group support --- docs/assets/css/bootstrap.css | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3389eb403..d957e861a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3171,6 +3171,48 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=75); } +.btn-group-vertical { + display: inline-block; +} + +.btn-group-vertical .btn { + display: block; + float: none; + width: 100%; + margin-left: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + +.btn-group-vertical .btn + .btn { + margin-top: -1px; +} + +.btn-group-vertical .btn:first-child { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} + +.btn-group-vertical .btn:last-child { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} + +.btn-group-vertical .btn-large:first-child { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} + +.btn-group-vertical .btn-large:last-child { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; +} + .alert { padding: 8px 35px 8px 14px; margin-bottom: 18px; -- cgit v1.2.3 From 9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 19:17:42 -0700 Subject: add separate vars for dropdown link hover and active states --- docs/assets/css/bootstrap.css | 7 ++++++- 1 file changed, 6 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 d957e861a..1726c41cb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2457,7 +2457,12 @@ table .span24 { } .dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, +.dropdown-menu li > a:focus { + color: #333333; + text-decoration: none; + background-color: #eeeeee; +} + .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; -- cgit v1.2.3 From ce140662a0a52d8ff2cd1acee4a57591d336249d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 20:01:03 -0700 Subject: remove unused container reset --- docs/assets/css/bootstrap.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1726c41cb..56405b5ff 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -194,9 +194,7 @@ a:hover { margin-left: 20px; } -.container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { +.container { width: 940px; } -- cgit v1.2.3 From d704d6f0ed3d87377b2c53f29c5d196f75c24e6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 23:37:47 -0700 Subject: #3861: add span to pagination selectors for full support of non-link pagination items --- docs/assets/css/bootstrap.css | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 56405b5ff..177fd693f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4111,7 +4111,8 @@ input[type="submit"].btn.btn-mini { display: inline; } -.pagination a { +.pagination a, +.pagination span { float: left; padding: 0 14px; line-height: 34px; @@ -4121,11 +4122,13 @@ input[type="submit"].btn.btn-mini { } .pagination a:hover, -.pagination .active a { +.pagination .active a, +.pagination .active span { background-color: #f5f5f5; } -.pagination .active a { +.pagination .active a, +.pagination .active span { color: #999999; cursor: default; } @@ -4138,14 +4141,16 @@ input[type="submit"].btn.btn-mini { background-color: transparent; } -.pagination li:first-child a { +.pagination li:first-child a, +.pagination li:first-child span { border-left-width: 1px; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.pagination li:last-child a { +.pagination li:last-child a, +.pagination li:last-child span { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; -- cgit v1.2.3 From b353565d4e0bf7d6a05b3295c0d8db5ca745bd1c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 20 Jun 2012 20:26:50 -0700 Subject: add docs for fluid offsetting --- docs/assets/css/bootstrap.css | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9803e2a6a..b939c7c0e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -388,6 +388,126 @@ a:hover { *width: 6.329787233638298%; } +.row-fluid .offset12 { + margin-left: 104.25531913799999%; + *margin-left: 104.14893615927657%; +} + +.row-fluid .offset12:first-child { + margin-left: 102.127659564%; + *margin-left: 102.02127658527658%; +} + +.row-fluid .offset11 { + margin-left: 95.744680841%; + *margin-left: 95.63829786227659%; +} + +.row-fluid .offset11:first-child { + margin-left: 93.61702126700001%; + *margin-left: 93.5106382882766%; +} + +.row-fluid .offset10 { + margin-left: 87.23404254399999%; + *margin-left: 87.12765956527657%; +} + +.row-fluid .offset10:first-child { + margin-left: 85.10638297%; + *margin-left: 84.99999999127658%; +} + +.row-fluid .offset9 { + margin-left: 78.723404247%; + *margin-left: 78.61702126827659%; +} + +.row-fluid .offset9:first-child { + margin-left: 76.59574467300001%; + *margin-left: 76.4893616942766%; +} + +.row-fluid .offset8 { + margin-left: 70.21276594999999%; + *margin-left: 70.10638297127657%; +} + +.row-fluid .offset8:first-child { + margin-left: 68.085106376%; + *margin-left: 67.97872339727658%; +} + +.row-fluid .offset7 { + margin-left: 61.702127653%; + *margin-left: 61.595744674276595%; +} + +.row-fluid .offset7:first-child { + margin-left: 59.574468079%; + *margin-left: 59.468085100276596%; +} + +.row-fluid .offset6 { + margin-left: 53.19148935599999%; + *margin-left: 53.08510637727659%; +} + +.row-fluid .offset6:first-child { + margin-left: 51.06382978199999%; + *margin-left: 50.95744680327659%; +} + +.row-fluid .offset5 { + margin-left: 44.680851059%; + *margin-left: 44.574468080276596%; +} + +.row-fluid .offset5:first-child { + margin-left: 42.553191485%; + *margin-left: 42.4468085062766%; +} + +.row-fluid .offset4 { + margin-left: 36.170212762%; + *margin-left: 36.063829783276596%; +} + +.row-fluid .offset4:first-child { + margin-left: 34.042553188%; + *margin-left: 33.9361702092766%; +} + +.row-fluid .offset3 { + margin-left: 27.659574465%; + *margin-left: 27.553191486276596%; +} + +.row-fluid .offset3:first-child { + margin-left: 25.531914891%; + *margin-left: 25.425531912276597%; +} + +.row-fluid .offset2 { + margin-left: 19.148936168%; + *margin-left: 19.042553189276596%; +} + +.row-fluid .offset2:first-child { + margin-left: 17.021276594%; + *margin-left: 16.914893615276597%; +} + +.row-fluid .offset1 { + margin-left: 10.638297870999999%; + *margin-left: 10.531914892276596%; +} + +.row-fluid .offset1:first-child { + margin-left: 8.510638297%; + *margin-left: 8.404255318276597%; +} + .container { margin-right: auto; margin-left: auto; -- cgit v1.2.3 From 160fe7ca597ff0fdaab0bb49494713724468b05b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 20 Jun 2012 23:46:51 -0700 Subject: create vars for responsive grid values, fixed and fluid, and document them in the customizer --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 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 74fe73277..404c5eb50 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -194,7 +194,9 @@ a:hover { margin-left: 20px; } -.container { +.container, +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { width: 940px; } -- cgit v1.2.3 From 71669dda63644a7b4162ca63f8b9c88b3586c7e4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 24 Jun 2012 20:26:48 -0700 Subject: tons of docs cleanup in css, adding subnav to official components --- docs/assets/css/bootstrap.css | 141 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 126 insertions(+), 15 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 404c5eb50..fcbae2b31 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3985,13 +3985,12 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; + padding: 9px 12px 11px; line-height: 19px; color: #999999; text-decoration: none; @@ -4045,18 +4044,18 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-right: 5px; margin-left: 5px; - background-color: #2c2c2c; - *background-color: #222222; - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-image: -moz-linear-gradient(top, #333333, #222222); + background-color: #1f1f1f; + *background-color: #151515; + background-image: -ms-linear-gradient(top, #262626, #151515); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#262626), to(#151515)); + background-image: -webkit-linear-gradient(top, #262626, #151515); + background-image: -o-linear-gradient(top, #262626, #151515); + background-image: linear-gradient(top, #262626, #151515); + background-image: -moz-linear-gradient(top, #262626, #151515); background-repeat: repeat-x; - border-color: #222222 #222222 #000000; + border-color: #151515 #151515 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff262626', endColorstr='#ff151515', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -4068,13 +4067,13 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + background-color: #151515; + *background-color: #080808; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #000000 \9; } .navbar .btn-navbar .icon-bar { @@ -4172,6 +4171,118 @@ input[type="submit"].btn.btn-mini { left: auto; } +/* Subnav +-------------------------------------------------- */ + +/* Base +------------------------- */ + +.subnav { + width: 100%; + height: 36px; + background-color: #f2f2f2; + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + border: 1px solid #e5e5e5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0); +} + +/* Nav links +------------------------- */ + +.subnav .nav { + margin-bottom: 0; +} + +.subnav .nav > li { + float: left; +} + +.subnav .nav > li > a { + padding: 8px 12px; + line-height: 20px; + border-right: 1px solid #e5e5e5; + border-left: 1px solid #f5f5f5; +} + +.subnav .nav > .active > a, +.subnav .nav > .active > a:hover { + padding-left: 13px; + color: #777; + background-color: #e9e9e9; + border-left: 0; + border-right-color: #ddd; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); +} + +.subnav .nav > .active > a .caret, +.subnav .nav > .active > a:hover .caret { + border-top-color: #777; +} + +.subnav .nav > li:first-child > a, +.subnav .nav > li:first-child > a:hover { + padding-left: 12px; + border-left: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.subnav .nav > li:last-child > a { + border-right: 0; +} + +/* Dropdown menus get matching border-radius +.subnav .dropdown-menu { + -webkit-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; + -moz-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; + border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; +} + + +/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ + +@media (min-width: 980px) { + .subnav-fixed { + position: fixed; + top: 40px; + right: 0; + left: 0; + z-index: 1020; + border-color: #d5d5d5; + border-width: 0 0 1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + } + .subnav-fixed .nav { + max-width: 780px; + padding: 0 1px; + margin: 0 auto; + } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + } +} + .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From 87af5d3bbe3546f9b876add2e35ad656accfc3ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 24 Jun 2012 20:42:31 -0700 Subject: more subnav optimizations --- docs/assets/css/bootstrap.css | 69 ++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 31 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fcbae2b31..8bb7b5d92 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2532,7 +2532,7 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; + padding: 5px 0; margin: 1px 0 0; list-style: none; background-color: #ffffff; @@ -2540,9 +2540,9 @@ table .span24 { border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -3585,38 +3585,35 @@ input[type="submit"].btn.btn-mini { } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { +.nav .dropdown-toggle .caret { margin-top: 6px; border-top-color: #0088cc; border-bottom-color: #0088cc; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { +.nav .dropdown-toggle:hover .caret { border-top-color: #005580; border-bottom-color: #005580; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; } .nav > .dropdown.active > a:hover { - color: #000000; + color: #fff; cursor: pointer; } @@ -3997,6 +3994,10 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; +} + .navbar .btn { display: inline-block; padding: 4px 10px 4px; @@ -4207,8 +4208,8 @@ input[type="submit"].btn.btn-mini { } .subnav .nav > li > a { - padding: 8px 12px; - line-height: 20px; + padding: 9px 12px; + line-height: 18px; border-right: 1px solid #e5e5e5; border-left: 1px solid #f5f5f5; } @@ -4225,11 +4226,6 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); } -.subnav .nav > .active > a .caret, -.subnav .nav > .active > a:hover .caret { - border-top-color: #777; -} - .subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover { padding-left: 12px; @@ -4243,13 +4239,24 @@ input[type="submit"].btn.btn-mini { border-right: 0; } -/* Dropdown menus get matching border-radius -.subnav .dropdown-menu { - -webkit-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; - -moz-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; - border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius; +/* Reposition the dropdown carets */ + +.subnav .nav .dropdown-toggle .caret { + margin-top: 7px; } +.nav .active .dropdown-toggle .caret { + border-top-color: #777; + border-bottom-color: #777; +} + +/* Dropdown menus get matching border-radius */ + +.subnav .dropdown-menu { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} /* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ -- cgit v1.2.3 From 6662f62236cd1800952fb45a528b79d9a899f5d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 24 Jun 2012 21:03:39 -0700 Subject: remove subnav file, instead add an optional class for .navbar --- docs/assets/css/bootstrap.css | 132 ++++++++++-------------------------------- 1 file changed, 29 insertions(+), 103 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8bb7b5d92..e760daae8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4172,122 +4172,48 @@ input[type="submit"].btn.btn-mini { left: auto; } -/* Subnav +/* Subnav navbar -------------------------------------------------- */ -/* Base -------------------------- */ - -.subnav { - width: 100%; +.navbar-subnav { height: 36px; - background-color: #f2f2f2; - background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: linear-gradient(top, #f5f5f5, #eeeeee); - background-repeat: repeat-x; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0); -} - -/* Nav links -------------------------- */ - -.subnav .nav { - margin-bottom: 0; -} - -.subnav .nav > li { - float: left; -} - -.subnav .nav > li > a { - padding: 9px 12px; - line-height: 18px; - border-right: 1px solid #e5e5e5; - border-left: 1px solid #f5f5f5; -} - -.subnav .nav > .active > a, -.subnav .nav > .active > a:hover { - padding-left: 13px; - color: #777; - background-color: #e9e9e9; - border-left: 0; - border-right-color: #ddd; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); -} - -.subnav .nav > li:first-child > a, -.subnav .nav > li:first-child > a:hover { - padding-left: 12px; - border-left: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; } -.subnav .nav > li:last-child > a { - border-right: 0; +.navbar-subnav .navbar-inner { + min-height: 36px; + padding: 0; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -ms-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: linear-gradient(top, #f9f9f9, #eeeeee); + background-repeat: repeat-x; + border: 1px solid #e5e5e5; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#ffeeeeee', GradientType=0); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -/* Reposition the dropdown carets */ - -.subnav .nav .dropdown-toggle .caret { - margin-top: 7px; +.navbar-subnav .nav > li > a { + color: #0088cc; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.nav .active .dropdown-toggle .caret { - border-top-color: #777; - border-bottom-color: #777; +.navbar-subnav .nav > li > a:hover { + color: #005580; } -/* Dropdown menus get matching border-radius */ - -.subnav .dropdown-menu { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; +.navbar-subnav .nav li.dropdown .dropdown-toggle .caret, +.navbar-subnav .nav li.dropdown.open .caret { + border-top-color: #0088cc; + border-bottom-color: #0088cc; } -/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ - -@media (min-width: 980px) { - .subnav-fixed { - position: fixed; - top: 40px; - right: 0; - left: 0; - z-index: 1020; - border-color: #d5d5d5; - border-width: 0 0 1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - } - .subnav-fixed .nav { - max-width: 780px; - padding: 0 1px; - margin: 0 auto; - } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - } +.navbar-subnav .nav .open > a { + color: #005580; } .breadcrumb { -- cgit v1.2.3 From 27845e4492741a973231ff1be6c493e001a28555 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 14:11:37 -0700 Subject: #3223: make table row hover optional class --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e760daae8..88db0c044 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1748,8 +1748,8 @@ table { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover td, +.table-hover tbody tr:hover th { background-color: #f5f5f5; } -- cgit v1.2.3 From cd466f1d0b51c5165f7b615c671ee94d53f48eeb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 14:37:35 -0700 Subject: add tests for table grid sizing, solve bugs in fluid table grid sizing --- docs/assets/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 88db0c044..ab0a0731a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1753,6 +1753,13 @@ table { background-color: #f5f5f5; } +table [class*=span], +.row-fluid table [class*=span] { + display: table-cell; + float: none; + margin-left: 0; +} + table .span1 { float: none; width: 44px; -- cgit v1.2.3 From 78849cf52ef2eba9dd8df621985ac277b67dd23b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 15:09:39 -0700 Subject: remove jank fix for dt bold text --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ab0a0731a..ffda9502f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -682,7 +682,6 @@ dd { dt { font-weight: bold; - line-height: 17px; } dd { -- cgit v1.2.3 From 8c2db7d7d62d22183601364e7dcaee4a12b083ea Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 15:46:46 -0700 Subject: prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack --- docs/assets/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ffda9502f..922c46b20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3104,17 +3104,8 @@ input[type="submit"].btn.btn-mini { .btn-group { position: relative; *margin-left: .3em; - *zoom: 1; -} - -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} - -.btn-group:after { - clear: both; + font-size: 0; + white-space: nowrap; } .btn-group:first-child { @@ -3140,13 +3131,22 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn { position: relative; - float: left; margin-left: -1px; + font-size: 13px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn-mini, +.btn-group > .btn-small { + font-size: 11px; +} + +.btn-group > .btn-large { + font-size: 15px; +} + .btn-group > .btn:first-child { margin-left: 0; -webkit-border-bottom-left-radius: 4px; -- cgit v1.2.3 From d65e815a48fd869bcdc4e4112cf675a1f987fc49 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 16:47:29 -0700 Subject: use @textColor to change help-block/help-inline font color --- 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 922c46b20..f499b3756 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1369,7 +1369,7 @@ textarea::-webkit-input-placeholder { .help-block, .help-inline { - color: #555555; + color: #595959; } .help-block { -- cgit v1.2.3 From 244a9ab79d13a88b8bb5ef59665a82088edd62d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 20:20:32 -0700 Subject: reverse the gradient on striped progress bars so it matches the active state when animated --- docs/assets/css/bootstrap.css | 87 ++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 60 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f499b3756..73887ceeb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -151,7 +151,6 @@ textarea { min-height: 28px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } @@ -320,7 +319,6 @@ a:hover { *margin-left: 2.0744680846382977%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } @@ -951,7 +949,6 @@ input[type="color"], box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; } @@ -2680,7 +2677,6 @@ table .span24 { opacity: 0; -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } @@ -2695,7 +2691,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -2747,7 +2742,6 @@ button.close { cursor: pointer; background-color: #f5f5f5; *background-color: #e6e6e6; - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); @@ -2798,7 +2792,6 @@ button.close { background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -2894,12 +2887,11 @@ button.close { .btn-primary { background-color: #0074cc; *background-color: #0055cc; - background-image: -ms-linear-gradient(top, #0088cc, #0055cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); background-image: linear-gradient(top, #0088cc, #0055cc); + background-image: -moz-linear-gradient(top, #0088cc, #0055cc); background-repeat: repeat-x; border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -2924,12 +2916,11 @@ button.close { .btn-warning { background-color: #faa732; *background-color: #f89406; - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: linear-gradient(top, #fbb450, #f89406); + background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -2954,12 +2945,11 @@ button.close { .btn-danger { background-color: #da4f49; *background-color: #bd362f; - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -2984,12 +2974,11 @@ button.close { .btn-success { background-color: #5bb75b; *background-color: #51a351; - background-image: -ms-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: -moz-linear-gradient(top, #62c462, #51a351); background-image: linear-gradient(top, #62c462, #51a351); + background-image: -moz-linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3014,12 +3003,11 @@ button.close { .btn-info { background-color: #49afcd; *background-color: #2f96b4; - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3044,12 +3032,11 @@ button.close { .btn-inverse { background-color: #414141; *background-color: #222222; - background-image: -ms-linear-gradient(top, #555555, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); background-image: -webkit-linear-gradient(top, #555555, #222222); background-image: -o-linear-gradient(top, #555555, #222222); - background-image: -moz-linear-gradient(top, #555555, #222222); background-image: linear-gradient(top, #555555, #222222); + background-image: -moz-linear-gradient(top, #555555, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3784,7 +3771,6 @@ input[type="submit"].btn.btn-mini { padding-left: 20px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); background-image: -webkit-linear-gradient(top, #333333, #222222); background-image: -o-linear-gradient(top, #333333, #222222); @@ -3914,7 +3900,6 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -webkit-transition: none; -moz-transition: none; - -ms-transition: none; -o-transition: none; transition: none; } @@ -4053,7 +4038,6 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; background-color: #1f1f1f; *background-color: #151515; - background-image: -ms-linear-gradient(top, #262626, #151515); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#262626), to(#151515)); background-image: -webkit-linear-gradient(top, #262626, #151515); background-image: -o-linear-gradient(top, #262626, #151515); @@ -4190,7 +4174,6 @@ input[type="submit"].btn.btn-mini { padding: 0; background-color: #f5f5f5; background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee); - background-image: -ms-linear-gradient(top, #f9f9f9, #eeeeee); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee)); background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee); background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee); @@ -4228,7 +4211,6 @@ input[type="submit"].btn.btn-mini { list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); @@ -4451,7 +4433,6 @@ input[type="submit"].btn.btn-mini { top: -25%; -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -ms-transition: opacity 0.3s linear, top 0.3s ease-out; -o-transition: opacity 0.3s linear, top 0.3s ease-out; transition: opacity 0.3s linear, top 0.3s ease-out; } @@ -4898,7 +4879,6 @@ a.badge:hover { overflow: hidden; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); @@ -4921,12 +4901,11 @@ a.badge:hover { text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); + background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); @@ -4934,23 +4913,20 @@ a.badge:hover { box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } .progress-striped .bar { background-color: #149bdf; - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -4968,7 +4944,6 @@ a.badge:hover { .progress-danger .bar { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); @@ -4980,17 +4955,15 @@ a.badge:hover { .progress-danger.progress-striped .bar { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-success .bar { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); @@ -5002,17 +4975,15 @@ a.badge:hover { .progress-success.progress-striped .bar { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-info .bar { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); @@ -5024,17 +4995,15 @@ a.badge:hover { .progress-info.progress-striped .bar { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-warning .bar { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); @@ -5046,11 +5015,10 @@ a.badge:hover { .progress-warning.progress-striped .bar { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { @@ -5100,7 +5068,6 @@ a.badge:hover { display: none; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -- cgit v1.2.3 From b77ed4a3a3c47af057e16db93ef41023d1cc5e08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 20:57:04 -0700 Subject: fix dropdowns in button groups after font-size hack --- 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 73887ceeb..d4b1eb894 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3119,12 +3119,16 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn { position: relative; margin-left: -1px; - font-size: 13px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn, +.btn-group > .dropdown-menu { + font-size: 13px; +} + .btn-group > .btn-mini, .btn-group > .btn-small { font-size: 11px; -- cgit v1.2.3 From c09e8473e2be483d3f53186840c002167647c44b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 10:03:46 -0700 Subject: use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta --- docs/assets/css/bootstrap.css | 218 ++++++++++++++++++++++++++++-------------- 1 file changed, 145 insertions(+), 73 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d4b1eb894..715c49baa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2644,8 +2644,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -4531,39 +4530,75 @@ input[type="submit"].btn.btn-mini { } .tooltip.top .tooltip-arrow { - bottom: 0; + bottom: -10px; left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; + margin-left: -10px; + border-top: 10px solid #cccccc; + border-top: 10px solid rgba(0, 0, 0, 0.2); + border-right: 10px solid transparent; + border-left: 10px solid transparent; +} + +.tooltip.top .tooltip-arrow:after { + bottom: 1px; + left: -9px; + border-top: 9px solid #ffffff; + border-right: 9px solid transparent; + border-left: 9px solid transparent; } .tooltip.left .tooltip-arrow { top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; + right: -10px; + margin-top: -10px; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid #cccccc; + border-left: 10px solid rgba(0, 0, 0, 0.2); +} + +.tooltip.left .tooltip-arrow:after { + right: 1px; + bottom: -9px; + border-top: 9px solid transparent; + border-bottom: 9px solid transparent; + border-left: 9px solid #ffffff; } .tooltip.bottom .tooltip-arrow { - top: 0; + top: -10px; left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; + margin-left: -10px; + border-right: 10px solid transparent; + border-bottom: 10px solid #cccccc; + border-bottom: 10px solid rgba(0, 0, 0, 0.2); + border-left: 10px solid transparent; +} + +.tooltip.bottom .tooltip-arrow:after { + top: 1px; + left: -9px; + border-right: 9px solid transparent; + border-bottom: 9px solid #f5f5f5; + border-left: 9px solid transparent; } .tooltip.right .tooltip-arrow { top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; + left: -10px; + margin-top: -10px; + border-top: 10px solid transparent; + border-right: 10px solid #cccccc; + border-right: 10px solid rgba(0, 0, 0, 0.2); + border-bottom: 10px solid transparent; +} + +.tooltip.right .tooltip-arrow:after { + bottom: -9px; + left: 1px; + border-top: 9px solid transparent; + border-right: 9px solid #ffffff; + border-bottom: 9px solid transparent; } .tooltip-inner { @@ -4590,59 +4625,107 @@ input[type="submit"].btn.btn-mini { left: 0; z-index: 1010; display: none; - padding: 5px; + width: 218px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .popover.top { - margin-top: -5px; + margin-bottom: 10px; } .popover.right { - margin-left: 5px; + margin-left: 10px; } .popover.bottom { - margin-top: 5px; + margin-top: 10px; } .popover.left { - margin-left: -5px; + margin-right: 10px; } .popover.top .arrow { - bottom: 0; + bottom: -10px; left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; + margin-left: -10px; + border-top: 10px solid #cccccc; + border-top: 10px solid rgba(0, 0, 0, 0.2); + border-right: 10px solid transparent; + border-left: 10px solid transparent; +} + +.popover.top .arrow:after { + bottom: 1px; + left: -9px; + border-top: 9px solid #ffffff; + border-right: 9px solid transparent; + border-left: 9px solid transparent; } .popover.right .arrow { top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; + left: -10px; + margin-top: -10px; + border-top: 10px solid transparent; + border-right: 10px solid #cccccc; + border-right: 10px solid rgba(0, 0, 0, 0.2); + border-bottom: 10px solid transparent; +} + +.popover.right .arrow:after { + bottom: -9px; + left: 1px; + border-top: 9px solid transparent; + border-right: 9px solid #ffffff; + border-bottom: 9px solid transparent; } .popover.bottom .arrow { - top: 0; + top: -10px; left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; + margin-left: -10px; + border-right: 10px solid transparent; + border-bottom: 10px solid #cccccc; + border-bottom: 10px solid rgba(0, 0, 0, 0.2); + border-left: 10px solid transparent; +} + +.popover.bottom .arrow:after { + top: 1px; + left: -9px; + border-right: 9px solid transparent; + border-bottom: 9px solid #f5f5f5; + border-left: 9px solid transparent; } .popover.left .arrow { top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; + right: -10px; + margin-top: -10px; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid #cccccc; + border-left: 10px solid rgba(0, 0, 0, 0.2); +} + +.popover.left .arrow:after { + right: 1px; + bottom: -9px; + border-top: 9px solid transparent; + border-bottom: 9px solid transparent; + border-left: 9px solid #ffffff; } .popover .arrow { @@ -4651,39 +4734,28 @@ input[type="submit"].btn.btn-mini { height: 0; } -.popover-inner { - width: 280px; - padding: 3px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); +.popover .arrow:after { + position: absolute; + display: inline-block; + width: 0; + height: 0; + content: ""; } .popover-title { - padding: 9px 15px; - line-height: 1; + padding: 8px 14px; + font-size: 14px; + font-weight: normal; + line-height: 18px; background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + border-bottom: 1px solid #e5e5e5; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } .popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + padding: 9px 14px; } .popover-content p, -- cgit v1.2.3 From c31a4e51316eb8767baebe9d8e370c782f15ea38 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 20:59:16 -0700 Subject: remove responsive subnav from docs and place in navbar-responsive.less --- docs/assets/css/bootstrap.css | 51 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 715c49baa..7adb65592 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3957,10 +3957,16 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; + -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-fixed-bottom { bottom: 0; + -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); } .navbar .nav { @@ -4175,15 +4181,15 @@ input[type="submit"].btn.btn-mini { .navbar-subnav .navbar-inner { min-height: 36px; padding: 0; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee); - background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee); - background-image: linear-gradient(top, #f9f9f9, #eeeeee); + background-color: #f6f6f6; + background-image: -moz-linear-gradient(top, #f9f9f9, #f1f1f1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#f1f1f1)); + background-image: -webkit-linear-gradient(top, #f9f9f9, #f1f1f1); + background-image: -o-linear-gradient(top, #f9f9f9, #f1f1f1); + background-image: linear-gradient(top, #f9f9f9, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#ffeeeeee', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff1f1f1', GradientType=0); -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -4208,6 +4214,37 @@ input[type="submit"].btn.btn-mini { color: #005580; } +.navbar-subnav-fixed { + position: fixed; + top: 40px; + right: 0; + left: 0; + z-index: 1020; + border-color: #d5d5d5; + border-width: 0 0 1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); +} + +.navbar-subnav-fixed .nav { + float: none; + max-width: 970px; + padding: 0 1px; + margin: 0 auto; +} + +.navbar-subnav .nav > li:first-child > a, +.navbar-subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From 98ebd548000bc080c6eb152cd2ef005938d2e516 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 21:20:40 -0700 Subject: address issues with fixed subnav like borders, corners, etc --- docs/assets/css/bootstrap.css | 22 +++++++++++++--------- 1 file changed, 13 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 7adb65592..f0f7dd77c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3987,7 +3987,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; - padding: 9px 12px 11px; + padding: 10px 12px 11px; line-height: 19px; color: #999999; text-decoration: none; @@ -4174,12 +4174,7 @@ input[type="submit"].btn.btn-mini { /* Subnav navbar -------------------------------------------------- */ -.navbar-subnav { - height: 36px; -} - .navbar-subnav .navbar-inner { - min-height: 36px; padding: 0; background-color: #f6f6f6; background-image: -moz-linear-gradient(top, #f9f9f9, #f1f1f1); @@ -4204,6 +4199,12 @@ input[type="submit"].btn.btn-mini { color: #005580; } +.navbar-subnav .nav > .active > a, +.navbar-subnav .nav > .active > a:hover { + color: #777; + background-color: #e5e5e5; +} + .navbar-subnav .nav li.dropdown .dropdown-toggle .caret, .navbar-subnav .nav li.dropdown.open .caret { border-top-color: #0088cc; @@ -4220,15 +4221,18 @@ input[type="submit"].btn.btn-mini { right: 0; left: 0; z-index: 1020; + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); +} + +.navbar-subnav-fixed .navbar-inner { border-color: #d5d5d5; border-width: 0 0 1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-subnav-fixed .nav { -- cgit v1.2.3 From 70e81e6f55ad77f3777e87c4edd646a2f5ac8bee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Jul 2012 08:42:09 -0700 Subject: new jumbotron --- docs/assets/css/bootstrap.css | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 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 f0f7dd77c..e4787ae1c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -130,6 +130,7 @@ textarea { .clearfix:before, .clearfix:after { display: table; + line-height: 0; content: ""; } @@ -181,6 +182,7 @@ a:hover { .row:before, .row:after { display: table; + line-height: 0; content: ""; } @@ -303,6 +305,7 @@ a:hover { .row-fluid:before, .row-fluid:after { display: table; + line-height: 0; content: ""; } @@ -515,6 +518,7 @@ a:hover { .container:before, .container:after { display: table; + line-height: 0; content: ""; } @@ -531,6 +535,7 @@ a:hover { .container-fluid:before, .container-fluid:after { display: table; + line-height: 0; content: ""; } @@ -1331,6 +1336,7 @@ select:focus:required:invalid:focus { .form-actions:before, .form-actions:after { display: table; + line-height: 0; content: ""; } @@ -1600,6 +1606,7 @@ legend + .control-group { .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; + line-height: 0; content: ""; } @@ -2758,9 +2765,9 @@ button.close { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2807,9 +2814,9 @@ button.close { background-color: #d9d9d9 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled, @@ -3029,17 +3036,17 @@ button.close { } .btn-inverse { - background-color: #414141; + background-color: #363636; *background-color: #222222; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-image: -moz-linear-gradient(top, #555555, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(top, #444444, #222222); + background-image: -moz-linear-gradient(top, #444444, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -3468,6 +3475,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs:after, .nav-pills:after { display: table; + line-height: 0; content: ""; } @@ -3641,6 +3649,7 @@ input[type="submit"].btn.btn-mini { .tabbable:before, .tabbable:after { display: table; + line-height: 0; content: ""; } @@ -3845,6 +3854,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:before, .navbar-form:after { display: table; + line-height: 0; content: ""; } @@ -4373,6 +4383,7 @@ input[type="submit"].btn.btn-mini { .pager:before, .pager:after { display: table; + line-height: 0; content: ""; } @@ -4522,6 +4533,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:before, .modal-footer:after { display: table; + line-height: 0; content: ""; } @@ -4814,6 +4826,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:before, .thumbnails:after { display: table; + line-height: 0; content: ""; } -- cgit v1.2.3 From b4125748b0d0e12a7855350ee3d9089e0a2f93e7 Mon Sep 17 00:00:00 2001 From: "Gavin Cooper (work)" Date: Wed, 4 Jul 2012 12:22:34 +0100 Subject: added ability to give rows in tables status classes .success .error and .info. --- docs/assets/css/bootstrap.css | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f0f7dd77c..a23ddc2c8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -130,6 +130,7 @@ textarea { .clearfix:before, .clearfix:after { display: table; + line-height: 0; content: ""; } @@ -181,6 +182,7 @@ a:hover { .row:before, .row:after { display: table; + line-height: 0; content: ""; } @@ -303,6 +305,7 @@ a:hover { .row-fluid:before, .row-fluid:after { display: table; + line-height: 0; content: ""; } @@ -515,6 +518,7 @@ a:hover { .container:before, .container:after { display: table; + line-height: 0; content: ""; } @@ -531,6 +535,7 @@ a:hover { .container-fluid:before, .container-fluid:after { display: table; + line-height: 0; content: ""; } @@ -1331,6 +1336,7 @@ select:focus:required:invalid:focus { .form-actions:before, .form-actions:after { display: table; + line-height: 0; content: ""; } @@ -1600,6 +1606,7 @@ legend + .control-group { .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; + line-height: 0; content: ""; } @@ -1676,6 +1683,18 @@ table { border-top: 2px solid #dddddd; } +.table .success td { + background-color: #dff0d8; +} + +.table .error td { + background-color: #f2dede; +} + +.table .info td { + background-color: #d9edf7; +} + .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -3468,6 +3487,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs:after, .nav-pills:after { display: table; + line-height: 0; content: ""; } @@ -3641,6 +3661,7 @@ input[type="submit"].btn.btn-mini { .tabbable:before, .tabbable:after { display: table; + line-height: 0; content: ""; } @@ -3845,6 +3866,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:before, .navbar-form:after { display: table; + line-height: 0; content: ""; } @@ -4373,6 +4395,7 @@ input[type="submit"].btn.btn-mini { .pager:before, .pager:after { display: table; + line-height: 0; content: ""; } @@ -4522,6 +4545,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:before, .modal-footer:after { display: table; + line-height: 0; content: ""; } @@ -4814,6 +4838,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:before, .thumbnails:after { display: table; + line-height: 0; content: ""; } -- cgit v1.2.3 From 62c386259b7fbd1ef665fc6baf4458c8e05ad1f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Jul 2012 23:31:30 -0700 Subject: rewrite docs homepage, new graphics --- docs/assets/css/bootstrap.css | 102 +++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 47 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e4787ae1c..7520a3b04 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2765,9 +2765,9 @@ button.close { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2891,17 +2891,17 @@ button.close { } .btn-primary { - background-color: #0074cc; - *background-color: #0055cc; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-color: #006dcc; + *background-color: #0044cc; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; + border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0055cc', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2910,13 +2910,13 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #0055cc; - *background-color: #004ab3; + background-color: #0044cc; + *background-color: #003bb3; } .btn-primary:active, .btn-primary.active { - background-color: #004099 \9; + background-color: #003399 \9; } .btn-warning { @@ -3233,7 +3233,7 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #0055cc; + background-color: #0044cc; } .btn-group.open .btn-warning.dropdown-toggle { @@ -3781,17 +3781,17 @@ input[type="submit"].btn.btn-mini { min-height: 40px; padding-right: 20px; padding-left: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(top, #222222, #111111); background-repeat: repeat-x; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); @@ -3906,8 +3906,8 @@ input[type="submit"].btn.btn-mini { font-weight: normal; line-height: 1; color: #ffffff; - background-color: #626262; - border: 1px solid #151515; + background-color: #515151; + border: 1px solid #040404; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); @@ -4032,7 +4032,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #222222; + background-color: #111111; } .navbar .divider-vertical { @@ -4040,8 +4040,8 @@ input[type="submit"].btn.btn-mini { height: 40px; margin: 0 9px; overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; + background-color: #111111; + border-right: 1px solid #222222; } .navbar .nav.pull-right { @@ -4055,17 +4055,17 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-right: 5px; margin-left: 5px; - background-color: #1f1f1f; - *background-color: #151515; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#262626), to(#151515)); - background-image: -webkit-linear-gradient(top, #262626, #151515); - background-image: -o-linear-gradient(top, #262626, #151515); - background-image: linear-gradient(top, #262626, #151515); - background-image: -moz-linear-gradient(top, #262626, #151515); + background-color: #0e0e0e; + *background-color: #040404; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(top, #151515, #040404); + background-image: -moz-linear-gradient(top, #151515, #040404); background-repeat: repeat-x; - border-color: #151515 #151515 #000000; + border-color: #040404 #040404 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff262626', endColorstr='#ff151515', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -4077,8 +4077,8 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #151515; - *background-color: #080808; + background-color: #040404; + *background-color: #000000; } .navbar .btn-navbar:active, @@ -4186,20 +4186,25 @@ input[type="submit"].btn.btn-mini { .navbar-subnav .navbar-inner { padding: 0; - background-color: #f6f6f6; - background-image: -moz-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#f1f1f1)); - background-image: -webkit-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: -o-linear-gradient(top, #f9f9f9, #f1f1f1); - background-image: linear-gradient(top, #f9f9f9, #f1f1f1); + background-color: #f9f9f9; + background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); + background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); + background-image: linear-gradient(top, #ffffff, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff1f1f1', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +.navbar-subnav .divider-vertical { + background-color: #f1f1f1; + border-right-color: #ffffff; +} + .navbar-subnav .nav > li > a { color: #0088cc; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -4212,7 +4217,10 @@ input[type="submit"].btn.btn-mini { .navbar-subnav .nav > .active > a, .navbar-subnav .nav > .active > a:hover { color: #777; - background-color: #e5e5e5; + background-color: #eee; + -webkit-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); + -moz-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); + box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); } .navbar-subnav .nav li.dropdown .dropdown-toggle .caret, -- cgit v1.2.3 From a645664e503475af2b8ed6f81f6860aad188f327 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 10:12:15 -0700 Subject: update thumbnails to fix display issues and refine aesthetics --- docs/assets/css/bootstrap.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7520a3b04..74f7094d3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4855,14 +4855,14 @@ input[type="submit"].btn.btn-mini { .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); } a.thumbnail:hover { @@ -4881,6 +4881,7 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; + color: #555555; } .label, -- cgit v1.2.3 From c6ee96c02587aeea0da52018325c100bfd45127a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 10:37:23 -0700 Subject: fix up subnav styles, add subnav search form styles, add some basic docs for subnav --- docs/assets/css/bootstrap.css | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74f7094d3..28a4b8467 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4185,13 +4185,12 @@ input[type="submit"].btn.btn-mini { -------------------------------------------------- */ .navbar-subnav .navbar-inner { - padding: 0; background-color: #f9f9f9; - background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); background-image: linear-gradient(top, #ffffff, #f1f1f1); + background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); @@ -4229,6 +4228,23 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #0088cc; } +.navbar-subnav .search-query { + background-color: #fff; + border-color: #ccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); +} + +.navbar-subnav .search-query:focus, +.navbar-subnav .search-query.focused { + padding: 4px 9px; + border: 1px solid rgba(82, 168, 236, 0.8); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); +} + .navbar-subnav .nav .open > a { color: #005580; } -- cgit v1.2.3 From 3c07eaa251b73e6c5eff4b56e074c54708a4b4ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:11:54 -0700 Subject: updates to type scale --- docs/assets/css/bootstrap.css | 219 ++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 114 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 28a4b8467..4ec240ba5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -158,8 +158,8 @@ textarea { body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; color: #333333; background-color: #ffffff; } @@ -544,19 +544,19 @@ a:hover { } p { - margin: 0 0 9px; + margin: 0 0 10px; } p small { - font-size: 11px; + font-size: 12px; color: #999999; } .lead { - margin-bottom: 18px; + margin-bottom: 20px; font-size: 20px; font-weight: 200; - line-height: 27px; + line-height: 30px; } h1, @@ -565,9 +565,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 1; color: inherit; text-rendering: optimizelegibility; } @@ -583,70 +584,60 @@ h6 small { } h1 { - font-size: 30px; - line-height: 36px; -} - -h1 small { - font-size: 18px; + font-size: 36px; + line-height: 40px; } h2 { - font-size: 24px; - line-height: 36px; + font-size: 30px; + line-height: 40px; } -h2 small { - font-size: 18px; +h3 { + font-size: 24px; + line-height: 40px; } -h3 { +h4 { font-size: 18px; - line-height: 27px; + line-height: 20px; } -h3 small { +h5 { font-size: 14px; + line-height: 20px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 12px; + line-height: 20px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 18px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + margin: 20px 0 19px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} - ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, @@ -665,7 +656,7 @@ ol { } li { - line-height: 18px; + line-height: 20px; } ul.unstyled, @@ -675,12 +666,12 @@ ol.unstyled { } dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { @@ -688,7 +679,7 @@ dt { } dd { - margin-left: 9px; + margin-left: 10px; } .dl-horizontal dt { @@ -706,7 +697,7 @@ dd { } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; @@ -736,7 +727,7 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } @@ -744,12 +735,12 @@ blockquote p { margin-bottom: 0; font-size: 16px; font-weight: 300; - line-height: 22.5px; + line-height: 25px; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } @@ -779,9 +770,9 @@ blockquote:after { address { display: block; - margin-bottom: 18px; + margin-bottom: 20px; font-style: normal; - line-height: 18px; + line-height: 20px; } small { @@ -796,7 +787,7 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; + font-size: 13px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -812,10 +803,10 @@ code { pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 12.950000000000001px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -829,7 +820,7 @@ pre { } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { @@ -845,7 +836,7 @@ pre code { } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { @@ -858,16 +849,16 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 30px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } @@ -876,9 +867,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, @@ -911,11 +902,11 @@ input[type="tel"], input[type="color"], .uneditable-input { display: inline-block; - height: 18px; + height: 20px; padding: 4px; margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; color: #555555; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -1325,9 +1316,9 @@ select:focus:required:invalid:focus { } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; border-top: 1px solid #e5e5e5; *zoom: 1; @@ -1377,7 +1368,7 @@ textarea::-webkit-input-placeholder { .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { @@ -1403,7 +1394,7 @@ textarea::-webkit-input-placeholder { position: relative; margin-bottom: 0; *margin-left: 0; - font-size: 13px; + font-size: 14px; vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -1428,12 +1419,12 @@ textarea::-webkit-input-placeholder { .input-append .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; @@ -1590,16 +1581,16 @@ input.search-query { } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } @@ -1633,7 +1624,7 @@ legend + .control-group { } .form-horizontal .help-block { - margin-top: 9px; + margin-top: 10px; margin-bottom: 0; } @@ -1650,13 +1641,13 @@ table { .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -2569,7 +2560,7 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2581,7 +2572,7 @@ table .span24 { padding: 3px 15px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } @@ -2709,7 +2700,7 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; @@ -2738,8 +2729,8 @@ button.close { padding: 4px 10px 4px; margin-bottom: 0; *margin-left: .3em; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; *line-height: 20px; color: #333333; text-align: center; @@ -2833,7 +2824,7 @@ button.close { .btn-large { padding: 9px 14px; - font-size: 15px; + font-size: 16px; line-height: normal; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -2846,8 +2837,8 @@ button.close { .btn-small { padding: 5px 9px; - font-size: 11px; - line-height: 16px; + font-size: 12px; + line-height: 18px; } .btn-small [class^="icon-"] { @@ -2856,8 +2847,8 @@ button.close { .btn-mini { padding: 2px 6px; - font-size: 11px; - line-height: 14px; + font-size: 12px; + line-height: 16px; } .btn-primary, @@ -3110,8 +3101,8 @@ input[type="submit"].btn.btn-mini { } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + margin-top: 10px; + margin-bottom: 10px; } .btn-toolbar .btn-group { @@ -3132,16 +3123,16 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn, .btn-group > .dropdown-menu { - font-size: 13px; + font-size: 14px; } .btn-group > .btn-mini, .btn-group > .btn-small { - font-size: 11px; + font-size: 12px; } .btn-group > .btn-large { - font-size: 15px; + font-size: 16px; } .btn-group > .btn:first-child { @@ -3343,7 +3334,7 @@ input[type="submit"].btn.btn-mini { .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; color: #c09853; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; @@ -3357,7 +3348,7 @@ input[type="submit"].btn.btn-mini { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { @@ -3394,7 +3385,7 @@ input[type="submit"].btn.btn-mini { } .nav { - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 0; list-style: none; } @@ -3417,7 +3408,7 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -3458,7 +3449,7 @@ input[type="submit"].btn.btn-mini { .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -3508,7 +3499,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; @@ -3773,7 +3764,7 @@ input[type="submit"].btn.btn-mini { .navbar { *position: relative; *z-index: 2; - margin-bottom: 18px; + margin-bottom: 20px; overflow: visible; } @@ -3997,7 +3988,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; - padding: 10px 12px 11px; + padding: 10px 15px 11px; line-height: 19px; color: #999999; text-decoration: none; @@ -4012,7 +4003,7 @@ input[type="submit"].btn.btn-mini { display: inline-block; padding: 4px 10px 4px; margin: 5px 5px 6px; - line-height: 18px; + line-height: 20px; } .navbar .btn-group { @@ -4285,7 +4276,7 @@ input[type="submit"].btn.btn-mini { .breadcrumb { padding: 7px 14px; - margin: 0 0 18px; + margin: 0 0 20px; list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -4321,8 +4312,8 @@ input[type="submit"].btn.btn-mini { } .pagination { - height: 36px; - margin: 18px 0; + height: 40px; + margin: 20px 0; } .pagination ul { @@ -4347,7 +4338,7 @@ input[type="submit"].btn.btn-mini { .pagination span { float: left; padding: 0 14px; - line-height: 34px; + line-height: 38px; text-decoration: none; border: 1px solid #ddd; border-left-width: 0; @@ -4397,7 +4388,7 @@ input[type="submit"].btn.btn-mini { } .pager { - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 0; text-align: center; list-style: none; @@ -4864,7 +4855,7 @@ input[type="submit"].btn.btn-mini { .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } @@ -4902,7 +4893,7 @@ a.thumbnail:hover { .label, .badge { - font-size: 10.998px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -5177,7 +5168,7 @@ a.badge:hover { } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { @@ -5208,7 +5199,7 @@ a.badge:hover { .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } @@ -5338,7 +5329,7 @@ a.badge:hover { .hero-unit p { font-size: 18px; font-weight: 200; - line-height: 27px; + line-height: 30px; color: inherit; } -- cgit v1.2.3 From 68146db00454b46493545aff34d06cf2c11e0f6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:15:57 -0700 Subject: buttons and pre updates for font-size --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4ec240ba5..329618b05 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -786,7 +786,7 @@ cite { code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 13px; color: #333333; -webkit-border-radius: 3px; @@ -2726,7 +2726,7 @@ button.close { .btn { display: inline-block; *display: inline; - padding: 4px 10px 4px; + padding: 4px 14px 4px; margin-bottom: 0; *margin-left: .3em; font-size: 14px; -- cgit v1.2.3 From 19ea4668e5d62303b26e322d32b45d6268837c18 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jul 2012 10:35:08 -0700 Subject: prevent small tags from increasing height of headings --- docs/assets/css/bootstrap.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f0f7dd77c..1cd490716 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -130,6 +130,7 @@ textarea { .clearfix:before, .clearfix:after { display: table; + line-height: 0; content: ""; } @@ -181,6 +182,7 @@ a:hover { .row:before, .row:after { display: table; + line-height: 0; content: ""; } @@ -303,6 +305,7 @@ a:hover { .row-fluid:before, .row-fluid:after { display: table; + line-height: 0; content: ""; } @@ -515,6 +518,7 @@ a:hover { .container:before, .container:after { display: table; + line-height: 0; content: ""; } @@ -531,6 +535,7 @@ a:hover { .container-fluid:before, .container-fluid:after { display: table; + line-height: 0; content: ""; } @@ -574,6 +579,7 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } @@ -1331,6 +1337,7 @@ select:focus:required:invalid:focus { .form-actions:before, .form-actions:after { display: table; + line-height: 0; content: ""; } @@ -1600,6 +1607,7 @@ legend + .control-group { .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; + line-height: 0; content: ""; } @@ -3468,6 +3476,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs:after, .nav-pills:after { display: table; + line-height: 0; content: ""; } @@ -3641,6 +3650,7 @@ input[type="submit"].btn.btn-mini { .tabbable:before, .tabbable:after { display: table; + line-height: 0; content: ""; } @@ -3845,6 +3855,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:before, .navbar-form:after { display: table; + line-height: 0; content: ""; } @@ -4373,6 +4384,7 @@ input[type="submit"].btn.btn-mini { .pager:before, .pager:after { display: table; + line-height: 0; content: ""; } @@ -4522,6 +4534,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:before, .modal-footer:after { display: table; + line-height: 0; content: ""; } @@ -4814,6 +4827,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:before, .thumbnails:after { display: table; + line-height: 0; content: ""; } -- cgit v1.2.3 From dc6eaafb00426315a3720324d7fc3a4a33a04ddf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jul 2012 10:59:46 -0700 Subject: vertically align inline form content --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1cd490716..0a3e86393 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1551,6 +1551,7 @@ input.search-query { display: inline-block; *display: inline; margin-bottom: 0; + vertical-align: middle; *zoom: 1; } -- cgit v1.2.3 From e2336ef02ab620277e2d81f3fc6b4ff69e027ae4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 00:30:43 -0700 Subject: remove specific values for the fluid grid system and instead use LESS's percentage() function --- docs/assets/css/bootstrap.css | 148 +++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0a3e86393..3669a3c7a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -318,8 +318,8 @@ a:hover { float: left; width: 100%; min-height: 28px; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -330,183 +330,183 @@ a:hover { } .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; } .row-fluid .offset12 { - margin-left: 104.25531913799999%; - *margin-left: 104.14893615927657%; + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; } .row-fluid .offset12:first-child { - margin-left: 102.127659564%; - *margin-left: 102.02127658527658%; + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; } .row-fluid .offset11 { - margin-left: 95.744680841%; - *margin-left: 95.63829786227659%; + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; } .row-fluid .offset11:first-child { - margin-left: 93.61702126700001%; - *margin-left: 93.5106382882766%; + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; } .row-fluid .offset10 { - margin-left: 87.23404254399999%; - *margin-left: 87.12765956527657%; + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; } .row-fluid .offset10:first-child { - margin-left: 85.10638297%; - *margin-left: 84.99999999127658%; + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; } .row-fluid .offset9 { - margin-left: 78.723404247%; - *margin-left: 78.61702126827659%; + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; } .row-fluid .offset9:first-child { - margin-left: 76.59574467300001%; - *margin-left: 76.4893616942766%; + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; } .row-fluid .offset8 { - margin-left: 70.21276594999999%; - *margin-left: 70.10638297127657%; + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; } .row-fluid .offset8:first-child { - margin-left: 68.085106376%; - *margin-left: 67.97872339727658%; + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; } .row-fluid .offset7 { - margin-left: 61.702127653%; - *margin-left: 61.595744674276595%; + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; } .row-fluid .offset7:first-child { - margin-left: 59.574468079%; - *margin-left: 59.468085100276596%; + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; } .row-fluid .offset6 { - margin-left: 53.19148935599999%; - *margin-left: 53.08510637727659%; + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; } .row-fluid .offset6:first-child { - margin-left: 51.06382978199999%; - *margin-left: 50.95744680327659%; + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; } .row-fluid .offset5 { - margin-left: 44.680851059%; - *margin-left: 44.574468080276596%; + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; } .row-fluid .offset5:first-child { - margin-left: 42.553191485%; - *margin-left: 42.4468085062766%; + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; } .row-fluid .offset4 { - margin-left: 36.170212762%; - *margin-left: 36.063829783276596%; + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; } .row-fluid .offset4:first-child { - margin-left: 34.042553188%; - *margin-left: 33.9361702092766%; + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; } .row-fluid .offset3 { - margin-left: 27.659574465%; - *margin-left: 27.553191486276596%; + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; } .row-fluid .offset3:first-child { - margin-left: 25.531914891%; - *margin-left: 25.425531912276597%; + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; } .row-fluid .offset2 { - margin-left: 19.148936168%; - *margin-left: 19.042553189276596%; + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; } .row-fluid .offset2:first-child { - margin-left: 17.021276594%; - *margin-left: 16.914893615276597%; + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; } .row-fluid .offset1 { - margin-left: 10.638297870999999%; - *margin-left: 10.531914892276596%; + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; } .row-fluid .offset1:first-child { - margin-left: 8.510638297%; - *margin-left: 8.404255318276597%; + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; } .container { -- cgit v1.2.3 From e2b777d9a3ea12ec10f6046975ec0f43c6636601 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 12:34:47 -0700 Subject: docs pre font-size and nowrap on prepend/append --- 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 f19508441..babfe6351 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1384,6 +1384,7 @@ textarea::-webkit-input-placeholder { .input-append { margin-bottom: 5px; font-size: 0; + white-space: nowrap; } .input-prepend input, @@ -5043,7 +5044,7 @@ a.badge:hover { .progress .bar { width: 0; - height: 18px; + height: 100%; font-size: 12px; color: #ffffff; text-align: center; -- cgit v1.2.3 From 3f2f96b0d71e64bd53d5175d0876f25f23a7835b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 12:52:05 -0700 Subject: reoder forms a bit --- docs/assets/css/bootstrap.css | 77 ++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 41 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index babfe6351..39ea788be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -995,11 +995,6 @@ input[type="checkbox"] { width: auto; } -.uneditable-textarea { - width: auto; - height: auto; -} - select, input[type="file"] { height: 28px; @@ -1030,6 +1025,42 @@ input[type="checkbox"]:focus { outline-offset: -2px; } +.uneditable-input, +.uneditable-textarea { + color: #999999; + cursor: not-allowed; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); +} + +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} + +.uneditable-textarea { + width: auto; + height: auto; +} + +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} + +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} + +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; +} + .radio, .checkbox { min-height: 18px; @@ -1336,32 +1367,6 @@ select:focus:required:invalid:focus { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - .help-block, .help-inline { color: #595959; @@ -1412,11 +1417,6 @@ textarea::-webkit-input-placeholder { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} - .input-prepend .add-on, .input-append .add-on { display: inline-block; @@ -1470,11 +1470,6 @@ textarea::-webkit-input-placeholder { border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; -} - .input-append .add-on:last-child, .input-append .btn:last-child { -webkit-border-radius: 0 3px 3px 0; -- cgit v1.2.3 From 5f861ef51735d8b0f2c0f0faf8f438808a480d99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 23:16:07 -0700 Subject: fix up docs to use default container, fix responsive home changes --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 39ea788be..d24c6f36a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -788,7 +788,7 @@ code, pre { padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 13px; + font-size: 12px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -806,7 +806,7 @@ pre { display: block; padding: 9.5px; margin: 0 0 10px; - font-size: 12.950000000000001px; + font-size: 12px; line-height: 20px; word-break: break-all; word-wrap: break-word; -- cgit v1.2.3 From 20676ddd4d3e46c9fb32aadfeddb3a4a68efa6a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jul 2012 01:47:36 -0700 Subject: adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar --- 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 d24c6f36a..6e2ab728c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -631,7 +631,8 @@ h4 small { } .page-header { - margin: 20px 0 19px; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -- cgit v1.2.3 From db9925510ba9328f227e5ad3935f73e0c67904d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jul 2012 21:47:16 -0700 Subject: fix up carousel alignment and line-height --- docs/assets/css/bootstrap.css | 11 ++++++++++- 1 file changed, 10 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 6e2ab728c..5af92fad1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5298,16 +5298,25 @@ a.badge:hover { right: 0; bottom: 0; left: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { + line-height: 20px; color: #ffffff; } +.carousel-caption h4 { + margin: 0 0 5px; +} + +.carousel-caption p { + margin-bottom: 0; +} + .hero-unit { padding: 60px; margin-bottom: 30px; -- cgit v1.2.3 From 8b696ad0b5fda07599bc3a865b1f2659345add3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:14:35 -0700 Subject: fix text in docs about default font-size and line-height --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5af92fad1..61398812e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5198,6 +5198,7 @@ a.badge:hover { .carousel { position: relative; + display: table; margin-bottom: 20px; line-height: 1; } -- cgit v1.2.3 From 16cf6b30cd0ea82dda210f021dfc163a3783fe1c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:17:36 -0700 Subject: docs changes for icons --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61398812e..5af92fad1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5198,7 +5198,6 @@ a.badge:hover { .carousel { position: relative; - display: table; margin-bottom: 20px; line-height: 1; } -- cgit v1.2.3 From 9887d3cf4af4897c4959491ece2fe56bef3d1114 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:26:32 -0700 Subject: updating docs examples to remove 13/18 resets, fix up buttons alignments and carets --- docs/assets/css/bootstrap.css | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5af92fad1..678559c5a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2498,8 +2498,8 @@ table .span24 { .caret { display: inline-block; width: 0; - height: 0; - vertical-align: top; + height: 3px; + vertical-align: middle; border-top: 4px solid #000000; border-right: 4px solid transparent; border-left: 4px solid transparent; @@ -2509,7 +2509,6 @@ table .span24 { } .dropdown .caret { - margin-top: 8px; margin-left: 2px; } @@ -2617,6 +2616,8 @@ table .span24 { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { + height: 0; + margin-top: -2px; border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; @@ -3187,28 +3188,28 @@ input[type="submit"].btn.btn-mini { } .btn-group > .dropdown-toggle { - *padding-top: 4px; - padding-right: 8px; - *padding-bottom: 4px; - padding-left: 8px; + *padding-top: 8px; + padding-right: 10px; + *padding-bottom: 8px; + padding-left: 10px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group > .btn-mini.dropdown-toggle { - padding-right: 5px; - padding-left: 5px; + padding-right: 8px; + padding-left: 8px; } .btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 6px; + *padding-bottom: 6px; } .btn-group > .btn-large.dropdown-toggle { - padding-right: 12px; - padding-left: 12px; + padding-right: 14px; + padding-left: 14px; } .btn-group.open .dropdown-toggle { @@ -3247,7 +3248,6 @@ input[type="submit"].btn.btn-mini { } .btn .caret { - margin-top: 7px; margin-left: 0; } @@ -3257,16 +3257,7 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=100); } -.btn-mini .caret { - margin-top: 5px; -} - -.btn-small .caret { - margin-top: 6px; -} - .btn-large .caret { - margin-top: 6px; border-top-width: 5px; border-right-width: 5px; border-left-width: 5px; -- cgit v1.2.3 From 25d0b341a9a89ae2f0da4a506c26ac77db011350 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:31:54 -0700 Subject: wasn't feeling the new buttons, downsizing again until we get a better balance --- docs/assets/css/bootstrap.css | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 678559c5a..57124eb4e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2498,8 +2498,8 @@ table .span24 { .caret { display: inline-block; width: 0; - height: 3px; - vertical-align: middle; + height: 0; + vertical-align: top; border-top: 4px solid #000000; border-right: 4px solid transparent; border-left: 4px solid transparent; @@ -2509,6 +2509,7 @@ table .span24 { } .dropdown .caret { + margin-top: 8px; margin-left: 2px; } @@ -2616,8 +2617,6 @@ table .span24 { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - height: 0; - margin-top: -2px; border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; @@ -2726,10 +2725,10 @@ button.close { .btn { display: inline-block; *display: inline; - padding: 4px 14px 4px; + padding: 4px 14px; margin-bottom: 0; *margin-left: .3em; - font-size: 14px; + font-size: 13px; line-height: 20px; *line-height: 20px; color: #333333; @@ -3123,7 +3122,7 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn, .btn-group > .dropdown-menu { - font-size: 14px; + font-size: 13px; } .btn-group > .btn-mini, @@ -3188,28 +3187,28 @@ input[type="submit"].btn.btn-mini { } .btn-group > .dropdown-toggle { - *padding-top: 8px; - padding-right: 10px; - *padding-bottom: 8px; - padding-left: 10px; + *padding-top: 4px; + padding-right: 8px; + *padding-bottom: 4px; + padding-left: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group > .btn-mini.dropdown-toggle { - padding-right: 8px; - padding-left: 8px; + padding-right: 5px; + padding-left: 5px; } .btn-group > .btn-small.dropdown-toggle { - *padding-top: 6px; - *padding-bottom: 6px; + *padding-top: 4px; + *padding-bottom: 4px; } .btn-group > .btn-large.dropdown-toggle { - padding-right: 14px; - padding-left: 14px; + padding-right: 12px; + padding-left: 12px; } .btn-group.open .dropdown-toggle { @@ -3248,6 +3247,7 @@ input[type="submit"].btn.btn-mini { } .btn .caret { + margin-top: 7px; margin-left: 0; } @@ -3257,7 +3257,16 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=100); } +.btn-mini .caret { + margin-top: 5px; +} + +.btn-small .caret { + margin-top: 6px; +} + .btn-large .caret { + margin-top: 6px; border-top-width: 5px; border-right-width: 5px; border-left-width: 5px; -- cgit v1.2.3 From 07f80e6fd8664c9450b5e363631ed330bb7c3136 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:42:38 -0700 Subject: fixes #4027: same margins on .pager and .pagination --- docs/assets/css/bootstrap.css | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57124eb4e..9f313a9e1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2755,9 +2755,9 @@ button.close { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2804,9 +2804,9 @@ button.close { background-color: #d9d9d9 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled, @@ -4387,8 +4387,7 @@ input[type="submit"].btn.btn-mini { } .pager { - margin-bottom: 20px; - margin-left: 0; + margin: 20px 0; text-align: center; list-style: none; *zoom: 1; -- cgit v1.2.3 From 7800fee7e0874446bbbcd6148206800cdebe2fe9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:51:38 -0700 Subject: fixes #3973: same border on disabled inputs as default inputs: --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9f313a9e1..4a66eb66d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1223,7 +1223,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], -- cgit v1.2.3 From 93be608bf0a4b85ec3331ebcc14e40f99a1974f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 20:49:17 -0700 Subject: fixes #3384: add support for multiple inputs per line when using grid sizing --- docs/assets/css/bootstrap.css | 57 ++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 17 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4a66eb66d..360461afe 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1143,6 +1143,10 @@ textarea, margin-left: 0; } +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; +} + input.span12, textarea.span12, .uneditable-input.span12 { @@ -1215,6 +1219,25 @@ textarea.span1, width: 50px; } +.controls-row { + *zoom: 1; +} + +.controls-row:before, +.controls-row:after { + display: table; + line-height: 0; + content: ""; +} + +.controls-row:after { + clear: both; +} + +.controls-row [class*="span"] { + float: left; +} + input[disabled], select[disabled], textarea[disabled], @@ -2740,7 +2763,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-repeat: repeat-x; border: 1px solid #cccccc; @@ -2885,7 +2908,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; border-color: #0044cc #0044cc #002a80; @@ -2914,7 +2937,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; border-color: #f89406 #f89406 #ad6704; @@ -2943,7 +2966,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; border-color: #bd362f #bd362f #802420; @@ -2972,7 +2995,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-image: -moz-linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; border-color: #51a351 #51a351 #387038; @@ -3001,7 +3024,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; border-color: #2f96b4 #2f96b4 #1f6377; @@ -3030,7 +3053,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); background-image: -webkit-linear-gradient(top, #444444, #222222); background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); background-image: -moz-linear-gradient(top, #444444, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; @@ -3775,7 +3798,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); background-image: -webkit-linear-gradient(top, #222222, #111111); background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -4049,7 +4072,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); background-image: -webkit-linear-gradient(top, #151515, #040404); background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); background-image: -moz-linear-gradient(top, #151515, #040404); background-repeat: repeat-x; border-color: #040404 #040404 #000000; @@ -4178,7 +4201,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); - background-image: linear-gradient(top, #ffffff, #f1f1f1); + background-image: linear-gradient(to bottom, #ffffff, #f1f1f1); background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); background-repeat: repeat-x; border: 1px solid #e5e5e5; @@ -4281,7 +4304,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(to bottom, #ffffff, #f5f5f5); background-repeat: repeat-x; border: 1px solid #ddd; -webkit-border-radius: 3px; @@ -5025,7 +5048,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -5047,7 +5070,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); @@ -5090,7 +5113,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } @@ -5110,7 +5133,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } @@ -5130,7 +5153,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } @@ -5150,7 +5173,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -- cgit v1.2.3 From f495a8d0cc48d1440198e784a8f336a82e3a48bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 21:01:29 -0700 Subject: fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form --- docs/assets/css/bootstrap.css | 7 ++++--- 1 file changed, 4 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 360461afe..61da2f457 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3851,7 +3851,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn, .navbar .btn-group { - margin-top: 5px; + margin-top: 6px; } .navbar .btn-group .btn { @@ -3878,11 +3878,12 @@ input[type="submit"].btn.btn-mini { .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; + margin-top: 6px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } -- cgit v1.2.3 From f4877c236968ba61ac76f4862bba49e0354c60e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 21:13:33 -0700 Subject: fix up docs popover examples and copy --- 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 61da2f457..52dbf7a1c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4714,7 +4714,7 @@ input[type="submit"].btn.btn-mini { left: 0; z-index: 1010; display: none; - width: 218px; + width: 238px; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -4833,6 +4833,7 @@ input[type="submit"].btn.btn-mini { .popover-title { padding: 8px 14px; + margin: 0; font-size: 14px; font-weight: normal; line-height: 18px; -- cgit v1.2.3 From 64e87a85f5e17e3cf603b97e21d58b077060e7b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 22:14:30 -0700 Subject: remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 --- docs/assets/css/bootstrap.css | 249 +++++++++++++++++------------------------- 1 file changed, 100 insertions(+), 149 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 52dbf7a1c..f8edafa3b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4603,91 +4603,19 @@ input[type="submit"].btn.btn-mini { } .tooltip.top { - margin-top: -2px; + margin-top: -3px; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; } .tooltip.left { - margin-left: -2px; -} - -.tooltip.top .tooltip-arrow { - bottom: -10px; - left: 50%; - margin-left: -10px; - border-top: 10px solid #cccccc; - border-top: 10px solid rgba(0, 0, 0, 0.2); - border-right: 10px solid transparent; - border-left: 10px solid transparent; -} - -.tooltip.top .tooltip-arrow:after { - bottom: 1px; - left: -9px; - border-top: 9px solid #ffffff; - border-right: 9px solid transparent; - border-left: 9px solid transparent; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: -10px; - margin-top: -10px; - border-top: 10px solid transparent; - border-bottom: 10px solid transparent; - border-left: 10px solid #cccccc; - border-left: 10px solid rgba(0, 0, 0, 0.2); -} - -.tooltip.left .tooltip-arrow:after { - right: 1px; - bottom: -9px; - border-top: 9px solid transparent; - border-bottom: 9px solid transparent; - border-left: 9px solid #ffffff; -} - -.tooltip.bottom .tooltip-arrow { - top: -10px; - left: 50%; - margin-left: -10px; - border-right: 10px solid transparent; - border-bottom: 10px solid #cccccc; - border-bottom: 10px solid rgba(0, 0, 0, 0.2); - border-left: 10px solid transparent; -} - -.tooltip.bottom .tooltip-arrow:after { - top: 1px; - left: -9px; - border-right: 9px solid transparent; - border-bottom: 9px solid #f5f5f5; - border-left: 9px solid transparent; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: -10px; - margin-top: -10px; - border-top: 10px solid transparent; - border-right: 10px solid #cccccc; - border-right: 10px solid rgba(0, 0, 0, 0.2); - border-bottom: 10px solid transparent; -} - -.tooltip.right .tooltip-arrow:after { - bottom: -9px; - left: 1px; - border-top: 9px solid transparent; - border-right: 9px solid #ffffff; - border-bottom: 9px solid transparent; + margin-left: -3px; } .tooltip-inner { @@ -4706,6 +4634,40 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; +} + +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-top-color: #000000; + border-width: 5px 5px 0; +} + +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-right-color: #000000; + border-width: 5px 5px 5px 0; +} + +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-left-color: #000000; + border-width: 5px 0 5px 5px; +} + +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-bottom-color: #000000; + border-width: 0 5px 5px; } .popover { @@ -4745,113 +4707,102 @@ input[type="submit"].btn.btn-mini { margin-right: 10px; } +.popover-title { + padding: 8px 14px; + margin: 0; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f5f5f5; + border-bottom: 1px solid #dcdcdc; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +.popover-content { + padding: 9px 14px; +} + +.popover-content p, +.popover-content ul, +.popover-content ol { + margin-bottom: 0; +} + +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: inline-block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} + +.popover .arrow:after { + z-index: -1; + content: ""; +} + .popover.top .arrow { bottom: -10px; left: 50%; margin-left: -10px; - border-top: 10px solid #cccccc; - border-top: 10px solid rgba(0, 0, 0, 0.2); - border-right: 10px solid transparent; - border-left: 10px solid transparent; + border-top-color: #ffffff; + border-width: 10px 10px 0; } .popover.top .arrow:after { - bottom: 1px; - left: -9px; - border-top: 9px solid #ffffff; - border-right: 9px solid transparent; - border-left: 9px solid transparent; + bottom: -1px; + left: -11px; + border-top-color: rgba(0, 0, 0, 0.2); + border-width: 11px 11px 0; } .popover.right .arrow { top: 50%; left: -10px; margin-top: -10px; - border-top: 10px solid transparent; - border-right: 10px solid #cccccc; - border-right: 10px solid rgba(0, 0, 0, 0.2); - border-bottom: 10px solid transparent; + border-right-color: #ffffff; + border-width: 10px 10px 10px 0; } .popover.right .arrow:after { - bottom: -9px; - left: 1px; - border-top: 9px solid transparent; - border-right: 9px solid #ffffff; - border-bottom: 9px solid transparent; + bottom: -11px; + left: -1px; + border-right-color: rgba(0, 0, 0, 0.2); + border-width: 11px 11px 11px 0; } .popover.bottom .arrow { top: -10px; left: 50%; margin-left: -10px; - border-right: 10px solid transparent; - border-bottom: 10px solid #cccccc; - border-bottom: 10px solid rgba(0, 0, 0, 0.2); - border-left: 10px solid transparent; + border-bottom-color: #f5f5f5; + border-width: 0 10px 10px; } .popover.bottom .arrow:after { - top: 1px; - left: -9px; - border-right: 9px solid transparent; - border-bottom: 9px solid #f5f5f5; - border-left: 9px solid transparent; + top: -1px; + left: -11px; + border-bottom-color: rgba(0, 0, 0, 0.2); + border-width: 0 11px 11px; } .popover.left .arrow { top: 50%; right: -10px; margin-top: -10px; - border-top: 10px solid transparent; - border-bottom: 10px solid transparent; - border-left: 10px solid #cccccc; - border-left: 10px solid rgba(0, 0, 0, 0.2); + border-left-color: #ffffff; + border-width: 10px 0 10px 10px; } .popover.left .arrow:after { - right: 1px; - bottom: -9px; - border-top: 9px solid transparent; - border-bottom: 9px solid transparent; - border-left: 9px solid #ffffff; -} - -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} - -.popover .arrow:after { - position: absolute; - display: inline-block; - width: 0; - height: 0; - content: ""; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f5f5f5; - border-bottom: 1px solid #e5e5e5; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; + right: -1px; + bottom: -11px; + border-left-color: rgba(0, 0, 0, 0.2); + border-width: 11px 0 11px 11px; } .thumbnails { -- cgit v1.2.3 From 5d8e78e0faedb4365216f1ebbc5d70dc560f3f6e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jul 2012 00:32:04 -0700 Subject: fixes #3605: add support for input-prepend/-append to .form-search --- docs/assets/css/bootstrap.css | 71 +++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 19 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f8edafa3b..e290d8646 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -851,7 +851,7 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 30px; + margin-bottom: 20px; font-size: 21px; line-height: 40px; color: #333333; @@ -1408,19 +1408,19 @@ select:focus:required:invalid:focus { *zoom: 1; } -.input-prepend, -.input-append { +.input-append, +.input-prepend { margin-bottom: 5px; font-size: 0; white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, -.input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; @@ -1431,17 +1431,17 @@ select:focus:required:invalid:focus { border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; height: 20px; @@ -1457,18 +1457,18 @@ select:focus:required:invalid:focus { border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, -.input-prepend .btn, -.input-append .btn { +.input-prepend .add-on, +.input-append .btn, +.input-prepend .btn { margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1524,7 +1524,7 @@ select:focus:required:invalid:focus { border-radius: 0 3px 3px 0; } -input.search-query { +.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1537,6 +1537,39 @@ input.search-query { border-radius: 14px; } +/* Allow for input prepend/append in search forms */ + +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} + +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} + +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} + +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} + .form-search input, .form-inline input, .form-horizontal input, -- cgit v1.2.3 From 713105774fcccf1250a7555b47483b578cf82eb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jul 2012 00:45:44 -0700 Subject: fixes #3706: add textColor and textShadow as options to .buttonBackground mixin --- docs/assets/css/bootstrap.css | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e290d8646..e98f9357b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2820,6 +2820,7 @@ button.close { .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #e6e6e6; *background-color: #d9d9d9; } @@ -2905,22 +2906,6 @@ button.close { line-height: 16px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - .btn-primary.active, .btn-warning.active, .btn-danger.active, @@ -2936,6 +2921,8 @@ button.close { } .btn-primary { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #006dcc; *background-color: #0044cc; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); @@ -2955,6 +2942,7 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { + color: #ffffff; background-color: #0044cc; *background-color: #003bb3; } @@ -2965,6 +2953,8 @@ button.close { } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; *background-color: #f89406; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); @@ -2984,6 +2974,7 @@ button.close { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -2994,6 +2985,8 @@ button.close { } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; *background-color: #bd362f; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); @@ -3013,6 +3006,7 @@ button.close { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -3023,6 +3017,8 @@ button.close { } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; *background-color: #51a351; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); @@ -3042,6 +3038,7 @@ button.close { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -3052,6 +3049,8 @@ button.close { } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; *background-color: #2f96b4; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); @@ -3071,6 +3070,7 @@ button.close { .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -3081,6 +3081,8 @@ button.close { } .btn-inverse { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #363636; *background-color: #222222; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); @@ -3100,6 +3102,7 @@ button.close { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -4101,6 +4104,8 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-right: 5px; margin-left: 5px; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e0e0e; *background-color: #040404; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); @@ -4123,6 +4128,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { + color: #ffffff; background-color: #040404; *background-color: #000000; } -- cgit v1.2.3 From c884d6eaa6bbcf4cb4d679c4d9be57d2f28ce93b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jul 2012 13:50:27 -0700 Subject: clean up docs for subnav --- docs/assets/css/bootstrap.css | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e98f9357b..aae62efc6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4301,6 +4301,48 @@ input[type="submit"].btn.btn-mini { color: #005580; } +.navbar-subnav .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + *background-color: #e4e4e4; + background-image: -moz-linear-gradient(top, #f2f2f2, #e4e4e4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e4e4e4)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e4e4e4); + background-image: -o-linear-gradient(top, #f2f2f2, #e4e4e4); + background-image: linear-gradient(to bottom, #f2f2f2, #e4e4e4); + background-repeat: repeat-x; + border-color: #e4e4e4 #e4e4e4 #bebebe; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe4e4e4', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); +} + +.navbar-subnav .btn-navbar:hover, +.navbar-subnav .btn-navbar:active, +.navbar-subnav .btn-navbar.active, +.navbar-subnav .btn-navbar.disabled, +.navbar-subnav .btn-navbar[disabled] { + color: #ffffff; + background-color: #e4e4e4; + *background-color: #d7d7d7; +} + +.navbar-subnav .btn-navbar:active, +.navbar-subnav .btn-navbar.active { + background-color: #cbcbcb \9; +} + +.navbar .btn-navbar .icon-bar { + background-color: #999; + -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +} + .navbar-subnav-fixed { position: fixed; top: 40px; -- cgit v1.2.3 From 5cb116beb897b783195e059b205af52b0f5b72c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Jul 2012 10:58:20 -0700 Subject: cleanup subnav example --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index aae62efc6..30de241fe 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3950,6 +3950,7 @@ input[type="submit"].btn.btn-mini { .navbar-search .search-query { padding: 4px 9px; + margin-bottom: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; @@ -4237,12 +4238,14 @@ input[type="submit"].btn.btn-mini { -------------------------------------------------- */ .navbar-subnav .navbar-inner { + padding-right: 10px; + padding-left: 10px; background-color: #f9f9f9; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); - background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); background-image: linear-gradient(to bottom, #ffffff, #f1f1f1); background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); background-repeat: repeat-x; border: 1px solid #e5e5e5; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); -- cgit v1.2.3 From 750badabf760d7fb0a68a1a214442ecbdff8a16c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Jul 2012 14:43:51 -0700 Subject: copy edits and tweaks to utility classes to ensure they always are specific enough --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 30de241fe..123b2ac33 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5408,11 +5408,11 @@ a.badge:hover { } .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { -- cgit v1.2.3 From e20d2dfe9d1f43e164d8fdbef64f4041df70b762 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jul 2012 16:13:25 -0700 Subject: docs cleanup and blockquote cleanup for .pull-right option --- docs/assets/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 123b2ac33..0040d4d0f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -763,6 +763,14 @@ blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} + +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} + q:before, q:after, blockquote:before, -- cgit v1.2.3 From 478396fd4eaacd505104f44f97e0470409ce433a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 19:11:41 -0700 Subject: remove list-type declarations from ul and ol elements since those should just use browser defaults --- docs/assets/css/bootstrap.css | 8 -------- 1 file changed, 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0040d4d0f..3e79f9410 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -649,14 +649,6 @@ ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} - -ol { - list-style: decimal; -} - li { line-height: 20px; } -- cgit v1.2.3 From 39f8996d6a34ac2fab1bdf47db65fd9bde891308 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 22:26:53 -0700 Subject: fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding --- docs/assets/css/bootstrap.css | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3e79f9410..0226f24b5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2623,7 +2623,7 @@ table .span24 { .dropdown-menu a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; line-height: 20px; @@ -2633,9 +2633,17 @@ table .span24 { .dropdown-menu li > a:hover, .dropdown-menu li > a:focus { - color: #333333; + color: #ffffff; text-decoration: none; - background-color: #eeeeee; + background-color: #0088cc; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .active > a, @@ -2643,7 +2651,15 @@ table .span24 { color: #ffffff; text-decoration: none; background-color: #0088cc; + background-color: #0081c2; + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-repeat: repeat-x; outline: 0; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .disabled > a, @@ -2657,6 +2673,11 @@ table .span24 { background-color: transparent; } +.dropdown .dropdown-menu .nav-header { + padding-right: 20px; + padding-left: 20px; +} + .open { *z-index: 1000; } @@ -3659,13 +3680,23 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #005580; } +/* move down carets for tabs */ + +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; +} + .nav .active .dropdown-toggle .caret { border-top-color: #fff; border-bottom-color: #fff; } +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + .nav > .dropdown.active > a:hover { - color: #fff; cursor: pointer; } -- cgit v1.2.3 From 326b665065d8a1901cf53c145b98cbbdbdae6057 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 22:40:38 -0700 Subject: de-scope nav-header from .nav --- 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 0226f24b5..4905ff741 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3481,7 +3481,7 @@ input[type="submit"].btn.btn-mini { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; -- cgit v1.2.3 From aac3736eeaa1ff1eaf3a6a04502efd6d5b9e7e49 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 23:32:52 -0700 Subject: fixes #3845: add .btn-link for transparent buttons styled as links --- docs/assets/css/bootstrap.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 65e0c870f..239de594a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3175,6 +3175,26 @@ input[type="submit"].btn.btn-mini { *padding-bottom: 1px; } +.btn-link { + color: #0088cc; + cursor: pointer; + background-color: transparent; + background-image: none; + border-color: transparent; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +.btn-link:hover { + color: #005580; + text-decoration: underline; + background-color: transparent; +} + .btn-group { position: relative; *margin-left: .3em; -- cgit v1.2.3 From 89d7ec5290912ddd762f743f450b58b865afc6c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jul 2012 21:06:42 -0700 Subject: fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer --- docs/assets/css/bootstrap.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 239de594a..b9ea3b7d0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1803,6 +1803,24 @@ table { -moz-border-radius-bottomright: 4px; } +.table-bordered caption + thead tr:first-child th:first-child, +.table-bordered caption + tbody tr:first-child td:first-child, +.table-bordered colgroup + thead tr:first-child th:first-child, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; +} + +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-right-topleft: 4px; +} + .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; -- cgit v1.2.3 From 3c1a0fbda40d06ab0b89d07ad808aa6975c8381d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jul 2012 21:25:24 -0700 Subject: fixes #4103: simpler fix for tfoot in .table-border --- docs/assets/css/bootstrap.css | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9ea3b7d0..bc52f0f86 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1753,6 +1753,35 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + /* thead:last-child tr:last-child th:first-child, + tbody:last-child tr:last-child td:first-child, + tfoot tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + } + + tfoot ~ tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + } + + thead:last-child tr:last-child th:last-child, + tbody:last-child tr:last-child td:last-child, + tfoot tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + } + + tfoot ~ tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + } +*/ + } .table-bordered th, @@ -1787,7 +1816,8 @@ table { } .table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { +.table-bordered tbody:last-child tr:last-child td:first-child, +.table-bordered tfoot:last-child tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; @@ -1797,7 +1827,8 @@ table { } .table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered tbody:last-child tr:last-child td:last-child, +.table-bordered tfoot:last-child tr:last-child td:last-child { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; -- cgit v1.2.3 From 1d4660beeaa8ef987256a5e7008340505b00c859 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jul 2012 21:25:42 -0700 Subject: nuke commented out code from last fix --- docs/assets/css/bootstrap.css | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bc52f0f86..73ec0bf83 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1753,35 +1753,6 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - /* thead:last-child tr:last-child th:first-child, - tbody:last-child tr:last-child td:first-child, - tfoot tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - } - - tfoot ~ tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; - } - - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child, - tfoot tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - } - - tfoot ~ tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; - } -*/ - } .table-bordered th, -- cgit v1.2.3 From dcf75697ecd243517b23d8ef440f772d91f699c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 22 Jul 2012 18:28:39 -0700 Subject: some progress on affix plugin --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 73ec0bf83..5d9860248 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5501,3 +5501,7 @@ a.badge:hover { .invisible { visibility: hidden; } + +.affix { + position: fixed; +} -- cgit v1.2.3 From cd441e082f25836be85ecc14f0bed4d8e74965b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 23:56:13 -0700 Subject: fixes #4156: don't override border radius if stacked nav has one child --- docs/assets/css/bootstrap.css | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index df389af9c..5525614d6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3686,15 +3686,21 @@ input[type="submit"].btn.btn-mini { } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; } .nav-tabs.nav-stacked > li > a:hover { -- cgit v1.2.3 From 4912dd441d46dbacd7414628b6d70a8ae0d85d7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jul 2012 00:35:54 -0700 Subject: fix h3 in modal and make modal unhidden by removing important from earlier issue --- docs/assets/css/bootstrap.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5525614d6..4a4b3e5f4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4715,6 +4715,11 @@ input[type="submit"].btn.btn-mini { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 1; +} + .modal-body { max-height: 400px; padding: 15px; @@ -5498,11 +5503,11 @@ a.badge:hover { } .hide { - display: none !important; + display: none; } .show { - display: block !important; + display: block; } .invisible { -- cgit v1.2.3 From c37aa99e2836c333407db9d7d703ff731214f64e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jul 2012 00:37:19 -0700 Subject: modal heading line-height --- 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 4a4b3e5f4..b0c966d22 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4717,7 +4717,7 @@ input[type="submit"].btn.btn-mini { .modal-header h3 { margin: 0; - line-height: 1; + line-height: 30px; } .modal-body { -- cgit v1.2.3 From 7590e65f6f4641d946d0bfec2f4a84bbd3f561cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jul 2012 01:44:12 -0700 Subject: fix search form, mostly in navbar --- docs/assets/css/bootstrap.css | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b0c966d22..2598d89d9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1533,9 +1533,9 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } /* Allow for input prepend/append in search forms */ @@ -4034,12 +4034,12 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + padding: 4px 14px; margin-bottom: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; @@ -4048,6 +4048,9 @@ input[type="submit"].btn.btn-mini { color: #ffffff; background-color: #515151; border: 1px solid #040404; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); @@ -4071,7 +4074,7 @@ input[type="submit"].btn.btn-mini { .navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; + padding: 5px 15px; color: #333333; text-shadow: 0 1px 0 #ffffff; background-color: #ffffff; -- cgit v1.2.3 From 6474190746fd163375200119b9d2cc7066e05d43 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jul 2012 23:42:36 -0700 Subject: increase height of homepage jumbotron, update vars and styles of popovers --- docs/assets/css/bootstrap.css | 19 ++++++++++--------- 1 file changed, 10 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 2598d89d9..f806ed519 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4858,8 +4858,9 @@ input[type="submit"].btn.btn-mini { left: 0; z-index: 1010; display: none; - width: 238px; - background-color: #fff; + width: 236px; + padding: 1px; + background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); -webkit-border-radius: 6px; @@ -4895,8 +4896,8 @@ input[type="submit"].btn.btn-mini { font-size: 14px; font-weight: normal; line-height: 18px; - background-color: #f5f5f5; - border-bottom: 1px solid #dcdcdc; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -4938,7 +4939,7 @@ input[type="submit"].btn.btn-mini { .popover.top .arrow:after { bottom: -1px; left: -11px; - border-top-color: rgba(0, 0, 0, 0.2); + border-top-color: rgba(0, 0, 0, 0.25); border-width: 11px 11px 0; } @@ -4953,7 +4954,7 @@ input[type="submit"].btn.btn-mini { .popover.right .arrow:after { bottom: -11px; left: -1px; - border-right-color: rgba(0, 0, 0, 0.2); + border-right-color: rgba(0, 0, 0, 0.25); border-width: 11px 11px 11px 0; } @@ -4961,14 +4962,14 @@ input[type="submit"].btn.btn-mini { top: -10px; left: 50%; margin-left: -10px; - border-bottom-color: #f5f5f5; + border-bottom-color: #ffffff; border-width: 0 10px 10px; } .popover.bottom .arrow:after { top: -1px; left: -11px; - border-bottom-color: rgba(0, 0, 0, 0.2); + border-bottom-color: rgba(0, 0, 0, 0.25); border-width: 0 11px 11px; } @@ -4983,7 +4984,7 @@ input[type="submit"].btn.btn-mini { .popover.left .arrow:after { right: -1px; bottom: -11px; - border-left-color: rgba(0, 0, 0, 0.2); + border-left-color: rgba(0, 0, 0, 0.25); border-width: 11px 0 11px 11px; } -- cgit v1.2.3 From 1e9b4506196bd448c4038151964733ca524c10bb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jul 2012 00:06:43 -0700 Subject: add image styles, for now to scaffolding (soon to own file) --- docs/assets/css/bootstrap.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f806ed519..87922cf88 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -175,6 +175,28 @@ a:hover { text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} + +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} + .row { margin-left: -20px; *zoom: 1; -- cgit v1.2.3 From 9d5c4312232ebb53b2499ed495851c0d61eb648c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jul 2012 10:06:54 -0700 Subject: add basic support for sub menus in dropdown menus --- docs/assets/css/bootstrap.css | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87922cf88..f24baf581 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2687,7 +2687,8 @@ table .span24 { } .dropdown-menu li > a:hover, -.dropdown-menu li > a:focus { +.dropdown-menu li > a:focus, +.dropdown-submenu:hover > a { color: #ffffff; text-decoration: none; background-color: #0088cc; @@ -2728,11 +2729,6 @@ table .span24 { background-color: transparent; } -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - .open { *z-index: 1000; } @@ -2760,6 +2756,29 @@ table .span24 { margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} + +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -5px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} + +.dropdown-submenu:hover .dropdown-menu { + display: block; +} + +.dropdown .dropdown-menu .nav-header { + padding-right: 20px; + padding-left: 20px; +} + .typeahead { margin-top: 2px; -webkit-border-radius: 4px; -- cgit v1.2.3 From 16b4ac0d8fd5fd2aa588a8b486b71b449e3821ca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jul 2012 10:35:15 -0700 Subject: add docs for sub menu support on dropdowns, add caret via :after to submenu toggles --- docs/assets/css/bootstrap.css | 20 +++++++++++++++++++- 1 file changed, 19 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 f24baf581..c59a7fd97 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2763,7 +2763,7 @@ table .span24 { .dropdown-submenu > .dropdown-menu { top: 0; left: 100%; - margin-top: -5px; + margin-top: -6px; margin-left: -1px; -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; @@ -2774,6 +2774,24 @@ table .span24 { display: block; } +.dropdown-submenu > a:after { + display: block; + float: right; + width: 0; + height: 0; + margin-top: 5px; + margin-right: -10px; + border-color: transparent; + border-left-color: #cccccc; + border-style: solid; + border-width: 5px 0 5px 5px; + content: " "; +} + +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} + .dropdown .dropdown-menu .nav-header { padding-right: 20px; padding-left: 20px; -- cgit v1.2.3 From fe6a4b0b5497a78a085e85125f4397a27b7737dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jul 2012 15:42:58 -0700 Subject: add .btn-block for a full-width button option --- docs/assets/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c59a7fd97..700d92d78 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3019,6 +3019,16 @@ button.close { line-height: 16px; } +.btn-block { + display: block; + width: 100%; + padding-right: 0; + padding-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + .btn-primary.active, .btn-warning.active, .btn-danger.active, -- cgit v1.2.3 From a30045daef809edf5ed592ad842c04377898e444 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 00:30:15 -0700 Subject: reverse navbar styles to save code --- docs/assets/css/bootstrap.css | 378 ++++++++++++++++-------------------------- 1 file changed, 142 insertions(+), 236 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 700d92d78..adfba9b5d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2614,8 +2614,6 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { @@ -2623,17 +2621,6 @@ table .span24 { margin-left: 2px; } -.dropdown a:focus .caret, -.dropdown a:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.navbar .nav .open > a { - color: #ffffff; -} - .dropdown-menu { position: absolute; top: 100%; @@ -2643,7 +2630,7 @@ table .span24 { float: left; min-width: 160px; padding: 5px 0; - margin: 1px 0 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; @@ -3029,6 +3016,10 @@ button.close { box-sizing: border-box; } +.btn-block + .btn-block { + margin-top: 5px; +} + .btn-primary.active, .btn-warning.active, .btn-danger.active, @@ -3982,26 +3973,28 @@ input[type="submit"].btn.btn-mini { *z-index: 2; margin-bottom: 20px; overflow: visible; + color: #555555; } .navbar-inner { min-height: 40px; padding-right: 20px; padding-left: 20px; - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } .navbar .container { @@ -4012,36 +4005,32 @@ input[type="submit"].btn.btn-mini { height: auto; } -.navbar { - color: #999999; -} - -.navbar .brand:hover { - text-decoration: none; -} - .navbar .brand { display: block; float: left; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #555555; + text-shadow: 0 1px 0 #ffffff; } -.navbar .navbar-text { +.navbar .brand:hover { + text-decoration: none; +} + +.navbar-text { margin-bottom: 0; line-height: 40px; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #555555; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover { + color: #333333; } .navbar .btn, @@ -4114,19 +4103,9 @@ input[type="submit"].btn.btn-mini { font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #515151; - border: 1px solid #040404; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; } .navbar-search .search-query:-moz-placeholder { @@ -4141,19 +4120,6 @@ input[type="submit"].btn.btn-mini { color: #cccccc; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; @@ -4179,6 +4145,10 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; +} + +.navbar-fixed-top .navbar-inner { + border-width: 0 0 1px; -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); @@ -4186,6 +4156,10 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-bottom { bottom: 0; +} + +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); @@ -4209,32 +4183,19 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; - padding: 10px 15px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #555555; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + text-shadow: 0 1px 0 #ffffff; } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; } -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 20px; -} - -.navbar .btn-group { - padding: 5px 5px 6px; - margin: 0; -} - .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { - color: #ffffff; + color: #333333; text-decoration: none; background-color: transparent; } @@ -4242,23 +4203,12 @@ input[type="submit"].btn.btn-mini { .navbar .nav .active > a, .navbar .nav .active > a:hover, .navbar .nav .active > a:focus { - color: #ffffff; + color: #555555; text-decoration: none; - background-color: #111111; -} - -.navbar .divider-vertical { - width: 1px; - height: 40px; - margin: 0 9px; - overflow: hidden; - background-color: #111111; - border-right: 1px solid #222222; -} - -.navbar .nav.pull-right { - margin-right: 0; - margin-left: 10px; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { @@ -4269,17 +4219,17 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-image: -moz-linear-gradient(top, #151515, #040404); + background-color: #ededed; + *background-color: #e5e5e5; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - border-color: #040404 #040404 #000000; + border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -4292,13 +4242,13 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { color: #ffffff; - background-color: #040404; - *background-color: #000000; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #000000 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { @@ -4356,26 +4306,23 @@ input[type="submit"].btn.btn-mini { border-bottom: 0; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); -} - .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + color: #555555; + background-color: #e5e5e5; } -.navbar .nav li.dropdown.active > .dropdown-toggle:focus, -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } .navbar .pull-right .dropdown-menu, @@ -4396,150 +4343,109 @@ input[type="submit"].btn.btn-mini { left: auto; } -/* Subnav navbar --------------------------------------------------- */ - -.navbar-subnav .navbar-inner { - padding-right: 10px; - padding-left: 10px; - background-color: #f9f9f9; - background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1); - background-image: linear-gradient(to bottom, #ffffff, #f1f1f1); - background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1); - background-image: -o-linear-gradient(top, #ffffff, #f1f1f1); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1)); - background-repeat: repeat-x; - border: 1px solid #e5e5e5; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.navbar-subnav .divider-vertical { - background-color: #f1f1f1; - border-right-color: #ffffff; +.navbar-inverse { + color: #999999; } -.navbar-subnav .nav > li > a { - color: #0088cc; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); + background-repeat: repeat-x; + border-color: #252525; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); } -.navbar-subnav .nav > li > a:hover { - color: #005580; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { + color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.navbar-subnav .nav > .active > a, -.navbar-subnav .nav > .active > a:hover { - color: #777; - background-color: #eee; - -webkit-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); - -moz-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); - box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5); +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover { + color: #ffffff; } -.navbar-subnav .nav li.dropdown .dropdown-toggle .caret, -.navbar-subnav .nav li.dropdown.open .caret { - border-top-color: #0088cc; - border-bottom-color: #0088cc; +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + color: #ffffff; + background-color: transparent; } -.navbar-subnav .search-query { - background-color: #fff; - border-color: #ccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25); +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; } -.navbar-subnav .search-query:focus, -.navbar-subnav .search-query.focused { - padding: 4px 9px; - border: 1px solid rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); +.navbar-inverse .navbar-link { + color: #999999; } -.navbar-subnav .nav .open > a { - color: #005580; +.navbar-inverse .navbar-link:hover { + color: #ffffff; } -.navbar-subnav .btn-navbar { +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e4e4e4; - background-image: -moz-linear-gradient(top, #f2f2f2, #e4e4e4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e4e4e4)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e4e4e4); - background-image: -o-linear-gradient(top, #f2f2f2, #e4e4e4); - background-image: linear-gradient(to bottom, #f2f2f2, #e4e4e4); - background-repeat: repeat-x; - border-color: #e4e4e4 #e4e4e4 #bebebe; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe4e4e4', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25); + background-color: #111111; } -.navbar-subnav .btn-navbar:hover, -.navbar-subnav .btn-navbar:active, -.navbar-subnav .btn-navbar.active, -.navbar-subnav .btn-navbar.disabled, -.navbar-subnav .btn-navbar[disabled] { - color: #ffffff; - background-color: #e4e4e4; - *background-color: #d7d7d7; +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #999999; + border-bottom-color: #999999; } -.navbar-subnav .btn-navbar:active, -.navbar-subnav .btn-navbar.active { - background-color: #cbcbcb \9; +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.navbar .btn-navbar .icon-bar { - background-color: #999; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; } -.navbar-subnav-fixed { - position: fixed; - top: 40px; - right: 0; - left: 0; - z-index: 1020; - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1); +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; } -.navbar-subnav-fixed .navbar-inner { - border-color: #d5d5d5; - border-width: 0 0 1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - filter: progid:dximagetransform.microsoft.gradient(enabled=false); +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; } -.navbar-subnav-fixed .nav { - float: none; - max-width: 970px; - padding: 0 1px; - margin: 0 auto; +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; } -.navbar-subnav .nav > li:first-child > a, -.navbar-subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + outline: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } .breadcrumb { -- cgit v1.2.3 From 87ce3489d37ffa58c18de985808757785df8c7cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 16:25:20 -0700 Subject: remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons --- docs/assets/css/bootstrap.css | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index adfba9b5d..10a955507 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4449,24 +4449,13 @@ input[type="submit"].btn.btn-mini { } .breadcrumb { - padding: 7px 14px; + padding: 8px 15px; margin: 0 0 20px; list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(to bottom, #ffffff, #f5f5f5); - background-repeat: repeat-x; - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff5f5f5', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .breadcrumb li { -- cgit v1.2.3 From d63ebe3f3c885be05d93a1133d6feaa5be302536 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 16:36:16 -0700 Subject: more breadcrumb tweaks for contrast --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 10a955507..707f5d6dd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4467,11 +4467,11 @@ input[type="submit"].btn.btn-mini { .breadcrumb .divider { padding: 0 5px; - color: #999999; + color: #ccc; } -.breadcrumb .active a { - color: #333333; +.breadcrumb .active { + color: #999999; } .pagination { -- cgit v1.2.3 From 22a9a8365640cd8b09ee50580e7220e6d1d60e33 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 16:51:24 -0700 Subject: fixes #3694: provide override classes for .hide and .pull-right for grid columns --- docs/assets/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 707f5d6dd..d94a02943 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -532,6 +532,16 @@ a:hover { *margin-left: 8.404255319148938%; } +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} + +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; +} + .container { margin-right: auto; margin-left: auto; -- cgit v1.2.3 From cfac4bb59d120c747a2b410f6574f28fa464e271 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 23:51:40 -0700 Subject: fixes #4221: correct border-collapse property for IE7 hack --- 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 d94a02943..4a885d82a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1781,7 +1781,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; -- cgit v1.2.3 From b63543181aad029167de60bc3563aadcd6f895fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 10:08:27 -0700 Subject: fix examples collapse classes, rename navbar-redux to navbar and delete the old one --- docs/assets/css/bootstrap.css | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4a885d82a..9cabb3687 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4458,6 +4458,38 @@ input[type="submit"].btn.btn-mini { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + *background-color: #040404; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-image: -moz-linear-gradient(top, #151515, #040404); + background-repeat: repeat-x; + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); +} + +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} + +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} + .breadcrumb { padding: 8px 15px; margin: 0 0 20px; -- cgit v1.2.3 From 7fa99fb1fe9392f61cb5c46f7e5082e73e8b8784 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 12:15:08 -0700 Subject: fix navbar form alignment, and update examples to show these cases --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9cabb3687..f407a5db3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4018,7 +4018,7 @@ input[type="submit"].btn.btn-mini { .navbar .brand { display: block; float: left; - padding: 10px 20px 10px; + padding: 8px 20px 12px; margin-left: -20px; font-size: 20px; font-weight: 200; @@ -4072,7 +4072,7 @@ input[type="submit"].btn.btn-mini { .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { - margin-top: 6px; + margin-top: 5px; } .navbar-form input, -- cgit v1.2.3 From b2ebd5c46ca538142c5cd4164328c56053b5c79d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 12:52:44 -0700 Subject: update button styles to use updated 14px base font size, align carets to others with no opacity changes --- docs/assets/css/bootstrap.css | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f407a5db3..fa58f2ef3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2893,7 +2893,7 @@ button.close { padding: 4px 14px; margin-bottom: 0; *margin-left: .3em; - font-size: 13px; + font-size: 14px; line-height: 20px; *line-height: 20px; color: #333333; @@ -2909,11 +2909,11 @@ button.close { background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-repeat: repeat-x; - border: 1px solid #cccccc; + border: 1px solid #bbbbbb; *border: 0; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-bottom-color: #b3b3b3; + border-bottom-color: #a2a2a2; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3012,7 +3012,7 @@ button.close { .btn-mini { padding: 2px 6px; - font-size: 12px; + font-size: 11px; line-height: 16px; } @@ -3324,10 +3324,13 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn, .btn-group > .dropdown-menu { - font-size: 13px; + font-size: 14px; +} + +.btn-group > .btn-mini { + font-size: 11px; } -.btn-group > .btn-mini, .btn-group > .btn-small { font-size: 12px; } @@ -3388,7 +3391,7 @@ input[type="submit"].btn.btn-mini { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { *padding-top: 4px; padding-right: 8px; *padding-bottom: 4px; @@ -3398,17 +3401,17 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-right: 5px; padding-left: 5px; } -.btn-group > .btn-small.dropdown-toggle { +.btn-group > .btn-small + .dropdown-toggle { *padding-top: 4px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-right: 12px; padding-left: 12px; } @@ -3449,26 +3452,17 @@ input[type="submit"].btn.btn-mini { } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.btn-mini .caret { - margin-top: 5px; -} - -.btn-small .caret { +.btn-mini .caret, +.btn-small .caret, +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-top-width: 5px; border-right-width: 5px; border-left-width: 5px; @@ -3487,8 +3481,6 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); } .btn-group-vertical { -- cgit v1.2.3 From a9bf1e6e354e9833ba365b2a817c12d6b7bfa784 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 13:25:27 -0700 Subject: fixes #3900: nudge badges in buttons up 1px --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fa58f2ef3..dd9b96bc1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5128,6 +5128,12 @@ a.badge:hover { background-color: #1a1a1a; } +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} + @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; -- cgit v1.2.3 From 364dbb7931393cb8fa796d75ec1f32a757d335e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 15:38:36 -0700 Subject: fixes #3665: ensure inputs in a fluid row maintain grid sizing --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dd9b96bc1..59cf07579 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1165,6 +1165,10 @@ textarea[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"], .input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { display: inline-block; -- cgit v1.2.3 From 59eba9afbc4da210212688f84f679412760b96ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 15:54:03 -0700 Subject: remove position from labels/badges in mini btns --- docs/assets/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 59cf07579..5db99719b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5138,6 +5138,11 @@ a.badge:hover { top: -1px; } +.btn-mini .label, +.btn-mini .badge { + top: 0; +} + @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; -- cgit v1.2.3 From 196fb1d86a80ae3dad45eee2d34b738b80171132 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 22:26:54 -0700 Subject: fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child --- 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 5db99719b..a3451fd93 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2034,11 +2034,6 @@ table .span24 { background-repeat: no-repeat; } -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} - .icon-white { background-image: url("../img/glyphicons-halflings-white.png"); } -- cgit v1.2.3 From fab1a80dcb944f32fd9655d6bde3511d5df52aa2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Aug 2012 11:35:31 -0700 Subject: increase margin on checkboxes and radios to center properly --- 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 a3451fd93..22b8e3328 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1012,7 +1012,7 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { - margin: 3px 0; + margin: 4px 0; *margin-top: 0; /* IE7 */ -- cgit v1.2.3 From 735001cb266def8185367ae9d48207e46f6e023f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Aug 2012 11:53:00 -0700 Subject: increase horizontal padding on inputs given new font-size --- docs/assets/css/bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 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 22b8e3328..9054f68d4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -938,7 +938,7 @@ input[type="color"], .uneditable-input { display: inline-block; height: 20px; - padding: 4px; + padding: 4px 6px; margin-bottom: 9px; font-size: 14px; line-height: 20px; @@ -1187,73 +1187,73 @@ textarea, input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; + width: 926px; } input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; + width: 846px; } input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; + width: 766px; } input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; + width: 686px; } input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; + width: 606px; } input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; + width: 526px; } input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; + width: 446px; } input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; + width: 366px; } input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; + width: 286px; } input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; + width: 206px; } input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; + width: 126px; } input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; + width: 46px; } .controls-row { -- cgit v1.2.3 From b979cd9e67968526a5918f2bdedc66bf274c96d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Aug 2012 17:01:29 -0700 Subject: darken default button borders --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9054f68d4..bcbe4d9da 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3039,8 +3039,8 @@ button.close { } .btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); } .btn-primary { -- cgit v1.2.3 From 148203067978a13aeadd2127b0ddf00299cb8e98 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Aug 2012 23:15:51 -0700 Subject: fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit --- docs/assets/css/bootstrap.css | 117 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 15 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bcbe4d9da..b9d34e8e9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1300,22 +1300,51 @@ input[type="checkbox"][readonly] { .control-group.warning .checkbox, .control-group.warning .radio, -.control-group.warning input, +.control-group.warning input[type="text"], +.control-group.warning input[type="password"], +.control-group.warning input[type="datetime"], +.control-group.warning input[type="datetime-local"], +.control-group.warning input[type="date"], +.control-group.warning input[type="month"], +.control-group.warning input[type="time"], +.control-group.warning input[type="week"], +.control-group.warning input[type="number"], +.control-group.warning input[type="email"], +.control-group.warning input[type="url"], +.control-group.warning input[type="search"], +.control-group.warning input[type="tel"], +.control-group.warning input[type="color"], .control-group.warning select, .control-group.warning textarea { color: #c09853; border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning .checkbox:focus, .control-group.warning .radio:focus, -.control-group.warning input:focus, +.control-group.warning input[type="text"]:focus, +.control-group.warning input[type="password"]:focus, +.control-group.warning input[type="datetime"]:focus, +.control-group.warning input[type="datetime-local"]:focus, +.control-group.warning input[type="date"]:focus, +.control-group.warning input[type="month"]:focus, +.control-group.warning input[type="time"]:focus, +.control-group.warning input[type="week"]:focus, +.control-group.warning input[type="number"]:focus, +.control-group.warning input[type="email"]:focus, +.control-group.warning input[type="url"]:focus, +.control-group.warning input[type="search"]:focus, +.control-group.warning input[type="tel"]:focus, +.control-group.warning input[type="color"]:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, @@ -1333,22 +1362,51 @@ input[type="checkbox"][readonly] { .control-group.error .checkbox, .control-group.error .radio, -.control-group.error input, +.control-group.error input[type="text"], +.control-group.error input[type="password"], +.control-group.error input[type="datetime"], +.control-group.error input[type="datetime-local"], +.control-group.error input[type="date"], +.control-group.error input[type="month"], +.control-group.error input[type="time"], +.control-group.error input[type="week"], +.control-group.error input[type="number"], +.control-group.error input[type="email"], +.control-group.error input[type="url"], +.control-group.error input[type="search"], +.control-group.error input[type="tel"], +.control-group.error input[type="color"], .control-group.error select, .control-group.error textarea { color: #b94a48; border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error .checkbox:focus, .control-group.error .radio:focus, -.control-group.error input:focus, +.control-group.error input[type="text"]:focus, +.control-group.error input[type="password"]:focus, +.control-group.error input[type="datetime"]:focus, +.control-group.error input[type="datetime-local"]:focus, +.control-group.error input[type="date"]:focus, +.control-group.error input[type="month"]:focus, +.control-group.error input[type="time"]:focus, +.control-group.error input[type="week"]:focus, +.control-group.error input[type="number"]:focus, +.control-group.error input[type="email"]:focus, +.control-group.error input[type="url"]:focus, +.control-group.error input[type="search"]:focus, +.control-group.error input[type="tel"]:focus, +.control-group.error input[type="color"]:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, @@ -1366,22 +1424,51 @@ input[type="checkbox"][readonly] { .control-group.success .checkbox, .control-group.success .radio, -.control-group.success input, +.control-group.success input[type="text"], +.control-group.success input[type="password"], +.control-group.success input[type="datetime"], +.control-group.success input[type="datetime-local"], +.control-group.success input[type="date"], +.control-group.success input[type="month"], +.control-group.success input[type="time"], +.control-group.success input[type="week"], +.control-group.success input[type="number"], +.control-group.success input[type="email"], +.control-group.success input[type="url"], +.control-group.success input[type="search"], +.control-group.success input[type="tel"], +.control-group.success input[type="color"], .control-group.success select, .control-group.success textarea { color: #468847; border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success .checkbox:focus, .control-group.success .radio:focus, -.control-group.success input:focus, +.control-group.success input[type="text"]:focus, +.control-group.success input[type="password"]:focus, +.control-group.success input[type="datetime"]:focus, +.control-group.success input[type="datetime-local"]:focus, +.control-group.success input[type="date"]:focus, +.control-group.success input[type="month"]:focus, +.control-group.success input[type="time"]:focus, +.control-group.success input[type="week"]:focus, +.control-group.success input[type="number"]:focus, +.control-group.success input[type="email"]:focus, +.control-group.success input[type="url"]:focus, +.control-group.success input[type="search"]:focus, +.control-group.success input[type="tel"]:focus, +.control-group.success input[type="color"]:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, -- cgit v1.2.3 From d27dcf3b070015aca81d86de00e1b2ea6e0f30ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Aug 2012 23:16:49 -0700 Subject: cut down on selectors on .formFieldState() mixin to origin input catchall --- docs/assets/css/bootstrap.css | 90 +++---------------------------------------- 1 file changed, 6 insertions(+), 84 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9d34e8e9..651e764bd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1300,20 +1300,7 @@ input[type="checkbox"][readonly] { .control-group.warning .checkbox, .control-group.warning .radio, -.control-group.warning input[type="text"], -.control-group.warning input[type="password"], -.control-group.warning input[type="datetime"], -.control-group.warning input[type="datetime-local"], -.control-group.warning input[type="date"], -.control-group.warning input[type="month"], -.control-group.warning input[type="time"], -.control-group.warning input[type="week"], -.control-group.warning input[type="number"], -.control-group.warning input[type="email"], -.control-group.warning input[type="url"], -.control-group.warning input[type="search"], -.control-group.warning input[type="tel"], -.control-group.warning input[type="color"], +.control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; @@ -1325,20 +1312,7 @@ input[type="checkbox"][readonly] { .control-group.warning .checkbox:focus, .control-group.warning .radio:focus, -.control-group.warning input[type="text"]:focus, -.control-group.warning input[type="password"]:focus, -.control-group.warning input[type="datetime"]:focus, -.control-group.warning input[type="datetime-local"]:focus, -.control-group.warning input[type="date"]:focus, -.control-group.warning input[type="month"]:focus, -.control-group.warning input[type="time"]:focus, -.control-group.warning input[type="week"]:focus, -.control-group.warning input[type="number"]:focus, -.control-group.warning input[type="email"]:focus, -.control-group.warning input[type="url"]:focus, -.control-group.warning input[type="search"]:focus, -.control-group.warning input[type="tel"]:focus, -.control-group.warning input[type="color"]:focus, +.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; @@ -1362,20 +1336,7 @@ input[type="checkbox"][readonly] { .control-group.error .checkbox, .control-group.error .radio, -.control-group.error input[type="text"], -.control-group.error input[type="password"], -.control-group.error input[type="datetime"], -.control-group.error input[type="datetime-local"], -.control-group.error input[type="date"], -.control-group.error input[type="month"], -.control-group.error input[type="time"], -.control-group.error input[type="week"], -.control-group.error input[type="number"], -.control-group.error input[type="email"], -.control-group.error input[type="url"], -.control-group.error input[type="search"], -.control-group.error input[type="tel"], -.control-group.error input[type="color"], +.control-group.error input, .control-group.error select, .control-group.error textarea { color: #b94a48; @@ -1387,20 +1348,7 @@ input[type="checkbox"][readonly] { .control-group.error .checkbox:focus, .control-group.error .radio:focus, -.control-group.error input[type="text"]:focus, -.control-group.error input[type="password"]:focus, -.control-group.error input[type="datetime"]:focus, -.control-group.error input[type="datetime-local"]:focus, -.control-group.error input[type="date"]:focus, -.control-group.error input[type="month"]:focus, -.control-group.error input[type="time"]:focus, -.control-group.error input[type="week"]:focus, -.control-group.error input[type="number"]:focus, -.control-group.error input[type="email"]:focus, -.control-group.error input[type="url"]:focus, -.control-group.error input[type="search"]:focus, -.control-group.error input[type="tel"]:focus, -.control-group.error input[type="color"]:focus, +.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; @@ -1424,20 +1372,7 @@ input[type="checkbox"][readonly] { .control-group.success .checkbox, .control-group.success .radio, -.control-group.success input[type="text"], -.control-group.success input[type="password"], -.control-group.success input[type="datetime"], -.control-group.success input[type="datetime-local"], -.control-group.success input[type="date"], -.control-group.success input[type="month"], -.control-group.success input[type="time"], -.control-group.success input[type="week"], -.control-group.success input[type="number"], -.control-group.success input[type="email"], -.control-group.success input[type="url"], -.control-group.success input[type="search"], -.control-group.success input[type="tel"], -.control-group.success input[type="color"], +.control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; @@ -1449,20 +1384,7 @@ input[type="checkbox"][readonly] { .control-group.success .checkbox:focus, .control-group.success .radio:focus, -.control-group.success input[type="text"]:focus, -.control-group.success input[type="password"]:focus, -.control-group.success input[type="datetime"]:focus, -.control-group.success input[type="datetime-local"]:focus, -.control-group.success input[type="date"]:focus, -.control-group.success input[type="month"]:focus, -.control-group.success input[type="time"]:focus, -.control-group.success input[type="week"]:focus, -.control-group.success input[type="number"]:focus, -.control-group.success input[type="email"]:focus, -.control-group.success input[type="url"]:focus, -.control-group.success input[type="search"]:focus, -.control-group.success input[type="tel"]:focus, -.control-group.success input[type="color"]:focus, +.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -- cgit v1.2.3 From 8ed77c41f0a38556371eae7dbfdd07625bf7fca2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Aug 2012 22:37:38 -0700 Subject: fixes #4295: add vars for pagination --- 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 651e764bd..6bb9e1545 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4545,7 +4545,8 @@ input[type="submit"].btn.btn-mini { padding: 0 14px; line-height: 38px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -- cgit v1.2.3 From 4eee78e0513c2c08b26fb57c43d57b9cb0857a87 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Aug 2012 22:50:49 -0700 Subject: fixes #4304: more specific selectors on table border classes to override .table-striped --- docs/assets/css/bootstrap.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6bb9e1545..b2e903cc9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1774,18 +1774,6 @@ table { border-top: 2px solid #dddddd; } -.table .success td { - background-color: #dff0d8; -} - -.table .error td { - background-color: #f2dede; -} - -.table .info td { - background-color: #d9edf7; -} - .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1874,8 +1862,8 @@ table { background-color: #f9f9f9; } -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { +.table-hover tr:hover td, +.table-hover tr:hover th { background-color: #f5f5f5; } @@ -2030,6 +2018,18 @@ table .span24 { margin-left: 0; } +.table tbody .success td { + background-color: #dff0d8; +} + +.table tbody .error td { + background-color: #f2dede; +} + +.table tbody .info td { + background-color: #d9edf7; +} + [class^="icon-"], [class*=" icon-"] { display: inline-block; -- cgit v1.2.3 From 3c89f7bb5f69900db2d89348428019edd8fa7850 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Aug 2012 23:07:53 -0700 Subject: fix chevron on js docs and run make after table changes --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 b2e903cc9..810a67df3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2018,15 +2018,15 @@ table .span24 { margin-left: 0; } -.table tbody .success td { +.table tbody tr.success td { background-color: #dff0d8; } -.table tbody .error td { +.table tbody tr.error td { background-color: #f2dede; } -.table tbody .info td { +.table tbody tr.info td { background-color: #d9edf7; } -- cgit v1.2.3 From f6c7ac51f2761a666c933f584a558f0c24381a3a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 8 Aug 2012 11:26:22 -0700 Subject: add some simple styles for showing white icons on hover where appropriate --- docs/assets/css/bootstrap.css | 9 ++++++++- 1 file changed, 8 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 810a67df3..584e89549 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2043,7 +2043,14 @@ table .span24 { background-repeat: no-repeat; } -.icon-white { +/* White icons with optional class, or on hover/active states of certain elements */ + +.icon-white, +.nav > .active > a > [class^="icon-"], +.nav > .active > a > [class*=" icon-"], +.dropdown-menu > li > a:hover > [class^="icon-"], +.dropdown-menu > li > a:hover > [class*=" icon-"].dropdown-menu > .active > a > [class^="icon-"], +.dropdown-menu > .active > a > [class*=" icon-"] { background-image: url("../img/glyphicons-halflings-white.png"); } -- cgit v1.2.3 From 9f8ce77751e3c80d3cb794af9a19170e7f47a1fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Aug 2012 10:05:19 -0700 Subject: running make on previous changes --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 584e89549..fe6c3ef1f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3552,6 +3552,10 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } +.alert h4 { + margin: 0; +} + .alert .close { position: relative; top: -2px; -- cgit v1.2.3 From 97a23ef2e66919094ecfc517d9b5b9278a64441d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Aug 2012 22:57:40 -0700 Subject: fixes #4342: navbar vars not in use, render navbar dividers --- docs/assets/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fe6c3ef1f..6abfad081 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4054,6 +4054,13 @@ input[type="submit"].btn.btn-mini { color: #333333; } +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-right: 1px solid #ffffff; + border-left: 1px solid #f2f2f2; +} + .navbar .btn, .navbar .btn-group { margin-top: 6px; @@ -4129,18 +4136,6 @@ input[type="submit"].btn.btn-mini { border-radius: 15px; } -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; @@ -4412,6 +4407,11 @@ input[type="submit"].btn.btn-mini { color: #ffffff; } +.navbar-inverse .divider-vertical { + border-right-color: #222222; + border-left-color: #111111; +} + .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { -- cgit v1.2.3 From 2df0a0fdeb2ceec2cb193dee98d97cfb9c5e1b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Tue, 14 Aug 2012 13:58:12 +0200 Subject: now with 13 custom jquery plugins --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6abfad081..3fd9070be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1042,6 +1042,7 @@ input[type="file"] { select { width: 220px; + background-color: #ffffff; border: 1px solid #bbb; } -- cgit v1.2.3 From 2a6deb92b1786d572ed23347e486043e0df63547 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:29:31 -0700 Subject: fixes #4395: scope dropdown menu caret in navbar to first level dropdown only --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3fd9070be..c7fbc3e96 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4285,7 +4285,7 @@ input[type="submit"].btn.btn-mini { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { position: absolute; top: -7px; left: 9px; @@ -4297,7 +4297,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { position: absolute; top: -6px; left: 10px; @@ -4308,7 +4308,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { top: auto; bottom: -7px; border-top: 7px solid #ccc; @@ -4316,7 +4316,7 @@ input[type="submit"].btn.btn-mini { border-top-color: rgba(0, 0, 0, 0.2); } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { top: auto; bottom: -6px; border-top: 6px solid #ffffff; -- cgit v1.2.3 From 0b0d7f104c08307e0a6f275ccaa60db580d6f728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:32:03 -0700 Subject: fixes #4396: pull right dropdown menus no longer overlaid by submenus --- docs/assets/css/bootstrap.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c7fbc3e96..ec63378c5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4360,6 +4360,17 @@ input[type="submit"].btn.btn-mini { left: auto; } +.navbar .pull-right .dropdown-menu .dropdown-menu, +.navbar .dropdown-menu.pull-right .dropdown-menu { + right: 100%; + left: auto; + margin-right: -1px; + margin-left: 0; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + .navbar-inverse { color: #999999; } -- cgit v1.2.3 From dbcd87331d8a84fe5f65da0420409e859effebf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:51:33 -0700 Subject: fixes #4371: scope hovers on table rows to tbody --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec63378c5..d6cfbe099 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1863,8 +1863,8 @@ table { background-color: #f9f9f9; } -.table-hover tr:hover td, -.table-hover tr:hover th { +.table-hover tbody tr:hover td, +.table-hover tbody tr:hover th { background-color: #f5f5f5; } -- cgit v1.2.3 From 50df524ba1b504e069e69e6f317184357f397cd0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:53:45 -0700 Subject: remove borders entirely from fixed navbars --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6cfbe099..fb69a19ba 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4146,6 +4146,11 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner { + border: 0; +} + .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-right: 0; @@ -4165,7 +4170,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner { - border-width: 0 0 1px; -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); @@ -4176,7 +4180,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -- cgit v1.2.3 From 5144c77b272e12a48913faa0b7d1e54eccd2e638 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:57:49 -0700 Subject: fixes #4358: make select elements 30px tall to match inputs --- docs/assets/css/bootstrap.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fb69a19ba..f22d2824d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,6 +943,7 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; + vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1031,13 +1032,13 @@ input[type="checkbox"] { select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; + line-height: 30px; } select { -- cgit v1.2.3 From a80dafbb18bc689abcfe45cd4aec570e7790b171 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:00:22 -0700 Subject: fix width of star github btn in docs --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f22d2824d..5dee1cf35 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,7 +943,6 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; - vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -- cgit v1.2.3 From 780636d955d5c121133de526ba72c1874f7c0337 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:29:47 -0700 Subject: fixes #3674: checkbox vertical alignment in IE9 --- docs/assets/css/bootstrap.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5dee1cf35..7dd417c68 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1013,9 +1013,8 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { margin: 4px 0; + margin-top: 1px \9; *margin-top: 0; - /* IE7 */ - line-height: normal; cursor: pointer; } -- cgit v1.2.3 From f933a41c7bb71e58a4c151389748b92c8a204a27 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:34:10 -0700 Subject: remove bottom margin on radios and checkboxes --- 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 7dd417c68..8e7abe9f3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1012,7 +1012,7 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { - margin: 4px 0; + margin: 4px 0 0; margin-top: 1px \9; *margin-top: 0; line-height: normal; -- cgit v1.2.3 From f3479a39537b7b10bf66846c11d500f3364af88a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:44:25 -0700 Subject: compensate for ie7 button padding with no borders, fix indentation --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8e7abe9f3..a70f305a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3253,8 +3253,8 @@ button.close { button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, -- cgit v1.2.3 From 9c72246d491fa942635a27ee0047e473f4df05cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:24:58 -0700 Subject: navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 --- docs/assets/css/bootstrap.css | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a70f305a3..3c4ce62d1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -150,7 +150,7 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -340,7 +340,7 @@ a:hover { display: block; float: left; width: 100%; - min-height: 28px; + min-height: 30px; margin-left: 2.127659574468085%; *margin-left: 2.074468085106383%; -webkit-box-sizing: border-box; @@ -2865,6 +2865,7 @@ table .span24 { position: relative; height: 0; overflow: hidden; + overflow: visible \9; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -o-transition: height 0.35s ease; @@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { right: 0; left: auto; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { right: 12px; left: auto; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { right: 13px; left: auto; } -.navbar .pull-right .dropdown-menu .dropdown-menu, -.navbar .dropdown-menu.pull-right .dropdown-menu { +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { right: 100%; left: auto; margin-right: -1px; -- cgit v1.2.3 From 2ee035403d2dd9c19b7bfd3f90a83422a4ab7d7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:28:17 -0700 Subject: running make on prev merge --- 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 3c4ce62d1..7d706b036 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4030,7 +4030,7 @@ input[type="submit"].btn.btn-mini { .navbar .brand { display: block; float: left; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; -- cgit v1.2.3 From ada5589184550ea87b37ae3cba9edfce57c04e99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 Aug 2012 14:45:35 -0700 Subject: add transition to thumbnails --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d706b036..c31566751 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5059,6 +5059,10 @@ input[type="submit"].btn.btn-mini { -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s linear; + -moz-transition: all 0.2s linear; + -o-transition: all 0.2s linear; + transition: all 0.2s linear; } a.thumbnail:hover { -- cgit v1.2.3 From 54c645e33d379669015921116c87145f41099b56 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 Aug 2012 14:49:55 -0700 Subject: tweak transition --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c31566751..efc2e5915 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5059,10 +5059,10 @@ input[type="submit"].btn.btn-mini { -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s linear; - -moz-transition: all 0.2s linear; - -o-transition: all 0.2s linear; - transition: all 0.2s linear; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } a.thumbnail:hover { -- cgit v1.2.3 From ded21ebc91ee155b8196155fc9598a51be8fb55e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 11:22:45 -0700 Subject: fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 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 efc2e5915..27b4f6e6c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4220,9 +4220,9 @@ input[type="submit"].btn.btn-mini { background-color: transparent; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover, -.navbar .nav .active > a:focus { +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { color: #555555; text-decoration: none; background-color: #e5e5e5; -- cgit v1.2.3 From 51b43acf2005993f7d9a0b5ac8abbad72d7a2dc1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 11:23:39 -0700 Subject: run make on previous commit's merge --- 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 27b4f6e6c..f1c4afbbb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2049,7 +2049,8 @@ table .span24 { .nav > .active > a > [class^="icon-"], .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"].dropdown-menu > .active > a > [class^="icon-"], +.dropdown-menu > li > a:hover > [class*=" icon-"], +.dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"] { background-image: url("../img/glyphicons-halflings-white.png"); } -- cgit v1.2.3 From 79e05d0c0e9dd658382607f2c1b8eb508b05b491 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 11:24:48 -0700 Subject: change css version # --- 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 f1c4afbbb..2418692df 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.4 + * Bootstrap v2.1.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3 From b86e1fb62a25fcd955b1dbe5764788f2de36b735 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 11:31:21 -0700 Subject: additional navbar contrast: add inset shadow since we nuked the border --- docs/assets/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2418692df..b658de19a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4171,9 +4171,9 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-fixed-bottom { @@ -4181,9 +4181,9 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); } .navbar .nav { -- cgit v1.2.3 From 077577c7f3e71f7451513059ccd1c3775acc4025 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 11:46:23 -0700 Subject: fixes #4421: add static top navbar class --- docs/assets/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b658de19a..9a6bb867d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4138,6 +4138,18 @@ input[type="submit"].btn.btn-mini { border-radius: 15px; } +.navbar-static-top { + position: static; + width: 100%; + margin-bottom: 0; +} + +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; -- cgit v1.2.3 From 9e6322dbab50d416246317d0e0e1b02477845bb4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 12:59:32 -0700 Subject: fixes #4428: specifity on .search-query increased --- 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 9a6bb867d..ea03ef5a1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1570,7 +1570,7 @@ select:focus:required:invalid:focus { border-radius: 0 3px 3px 0; } -.search-query { +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; -- cgit v1.2.3 From 2b22c0c56efb86c213884897f14383f45e1414b3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 16:00:36 -0700 Subject: fixes #4438: button groups in inline forms now render inline --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 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 ea03ef5a1..c726bf0a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1651,7 +1651,9 @@ input.search-query { } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } -- cgit v1.2.3 From 5b947b8a2f801d33af2fe8d78f9655ce1ebd5e7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 16:11:52 -0700 Subject: fix up padding on small buttons, add button examples --- docs/assets/css/bootstrap.css | 7 ++++--- 1 file changed, 4 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 c726bf0a3..71209d601 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2037,6 +2037,7 @@ table .span24 { display: inline-block; width: 14px; height: 14px; + margin-top: 1px; *margin-right: .3em; line-height: 14px; vertical-align: text-top; @@ -3016,17 +3017,17 @@ button.close { } .btn-large [class^="icon-"] { - margin-top: 1px; + margin-top: 2px; } .btn-small { - padding: 5px 9px; + padding: 3px 9px; font-size: 12px; line-height: 18px; } .btn-small [class^="icon-"] { - margin-top: -1px; + margin-top: 0; } .btn-mini { -- cgit v1.2.3 From 256a25f25c8adc266f9af3099b5143cb49097443 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 16:28:45 -0700 Subject: fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71209d601..f8f16bbf2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1471,7 +1471,7 @@ select:focus:required:invalid:focus { margin-bottom: 0; *margin-left: 0; font-size: 14px; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1498,7 +1498,6 @@ select:focus:required:invalid:focus { line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } @@ -1508,6 +1507,7 @@ select:focus:required:invalid:focus { .input-append .btn, .input-prepend .btn { margin-left: -1px; + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; -- cgit v1.2.3 From 50638530e61307f174950ef295235a6dbddec6b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Aug 2012 16:30:47 -0700 Subject: fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well --- docs/assets/css/bootstrap.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f8f16bbf2..3af4a7945 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3286,18 +3286,22 @@ input[type="submit"].btn.btn-mini { *padding-bottom: 1px; } +.btn-link, +.btn-link:active { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + .btn-link { color: #0088cc; cursor: pointer; - background-color: transparent; - background-image: none; border-color: transparent; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; } .btn-link:hover { -- cgit v1.2.3 From e6e0e2ac9b0a31979531b6add3d1c8aaceb65f2e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Aug 2012 16:50:26 -0700 Subject: fixes #4442: allow for .btn within a .btn-toolbar without .btn-group --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3af4a7945..82fee6dae 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3328,6 +3328,7 @@ input[type="submit"].btn.btn-mini { .btn-toolbar { margin-top: 10px; margin-bottom: 10px; + font-size: 0; } .btn-toolbar .btn-group { @@ -3338,6 +3339,11 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } +.btn-toolbar .btn-group + .btn, +.btn-toolbar .btn + .btn-group { + margin-left: 5px; +} + .btn-group > .btn { position: relative; margin-left: -1px; -- cgit v1.2.3 From e79eb75e0944c2852fc47e117f4e96b984e40051 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Aug 2012 17:05:37 -0700 Subject: fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 82fee6dae..e550b175e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4710,7 +4710,7 @@ input[type="submit"].btn.btn-mini { } .modal-open .tooltip { - z-index: 2070; + z-index: 2080; } .modal-backdrop { @@ -4829,7 +4829,7 @@ input[type="submit"].btn.btn-mini { .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; padding: 5px; font-size: 11px; -- cgit v1.2.3 From 887f11d47f052a0dd123f76a6ac39a955c2429d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 13:12:19 -0700 Subject: fixes #4455: improve small styles and add to docs --- docs/assets/css/bootstrap.css | 45 +++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 25 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e550b175e..70f77af7e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -580,11 +580,6 @@ p { margin: 0 0 10px; } -p small { - font-size: 12px; - color: #999999; -} - .lead { margin-bottom: 20px; font-size: 20px; @@ -592,6 +587,26 @@ p small { line-height: 30px; } +small { + font-size: 85%; +} + +strong { + font-weight: bold; +} + +em { + font-style: italic; +} + +cite { + font-style: normal; +} + +.muted { + color: #999999; +} + h1, h2, h3, @@ -730,18 +745,6 @@ hr { border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -.muted { - color: #999999; -} - abbr[title] { cursor: help; border-bottom: 1px dotted #999999; @@ -810,14 +813,6 @@ address { line-height: 20px; } -small { - font-size: 100%; -} - -cite { - font-style: normal; -} - code, pre { padding: 0 3px 2px; -- cgit v1.2.3 From b745b7768a837a38ca47f174c62b8689e18e2733 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 17:07:41 -0700 Subject: fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars --- docs/assets/css/bootstrap.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 70f77af7e..38829e7d5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3334,6 +3334,7 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } +.btn-toolbar .btn + .btn, .btn-toolbar .btn-group + .btn, .btn-toolbar .btn + .btn-group { margin-left: 5px; @@ -3341,12 +3342,15 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn { position: relative; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} + .btn-group > .btn, .btn-group > .dropdown-menu { font-size: 14px; @@ -3516,7 +3520,6 @@ input[type="submit"].btn.btn-mini { display: block; float: none; width: 100%; - margin-left: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -3524,6 +3527,7 @@ input[type="submit"].btn.btn-mini { .btn-group-vertical .btn + .btn { margin-top: -1px; + margin-left: 0; } .btn-group-vertical .btn:first-child { -- cgit v1.2.3 From 4e979f084d0a0942cb820ca54786ad2b99e4acff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 21:12:52 -0700 Subject: fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs --- docs/assets/css/bootstrap.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 38829e7d5..3c16ef2f5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -219,6 +219,7 @@ a:hover { } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -4172,7 +4173,8 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { +.navbar-fixed-bottom .navbar-inner, +.navbar-static-top .navbar-inner { border: 0; } @@ -4185,6 +4187,7 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -4194,7 +4197,8 @@ input[type="submit"].btn.btn-mini { top: 0; } -.navbar-fixed-top .navbar-inner { +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -- cgit v1.2.3 From a667fd93aba8e947f94af973518b7dce25c08765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 23:01:24 -0700 Subject: pre font-size increase; revert static top navbar, undo contents section for now --- 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 3c16ef2f5..02a32014c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -836,7 +836,7 @@ pre { display: block; padding: 9.5px; margin: 0 0 10px; - font-size: 12px; + font-size: 13px; line-height: 20px; word-break: break-all; word-wrap: break-word; -- cgit v1.2.3 From 73cf9c4db8423f6987ff0eb828db32eaed21c975 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Aug 2012 10:28:41 -0700 Subject: fixes #4469 manually: reset width on file inputs --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 02a32014c..412e05e79 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1015,6 +1015,7 @@ input[type="checkbox"] { cursor: pointer; } +input[type="file"], input[type="image"], input[type="submit"], input[type="reset"], -- cgit v1.2.3 From 2fda6a45aa762f66e573a81c279f79e362f3593f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Aug 2012 11:22:37 -0700 Subject: bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work --- docs/assets/css/bootstrap.css | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 412e05e79..364509eca 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5254,8 +5254,8 @@ a.badge:hover { } .progress { - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; overflow: hidden; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); @@ -5274,6 +5274,7 @@ a.badge:hover { } .progress .bar { + float: left; width: 0; height: 100%; font-size: 12px; @@ -5281,11 +5282,11 @@ a.badge:hover { text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; + background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); @@ -5300,6 +5301,12 @@ a.badge:hover { transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); +} + .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); @@ -5321,7 +5328,8 @@ a.badge:hover { animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); @@ -5332,7 +5340,8 @@ a.badge:hover { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -5341,7 +5350,8 @@ a.badge:hover { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); @@ -5352,7 +5362,8 @@ a.badge:hover { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -5361,7 +5372,8 @@ a.badge:hover { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); @@ -5372,7 +5384,8 @@ a.badge:hover { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -5381,7 +5394,8 @@ a.badge:hover { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); @@ -5392,7 +5406,8 @@ a.badge:hover { filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -- cgit v1.2.3 From 58dd1f20aeee82d29693f731844a00cb9c5e4328 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Aug 2012 12:20:22 -0700 Subject: fix vertical button-groups in ie7 --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 364509eca..20a43ccbd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3516,6 +3516,10 @@ input[type="submit"].btn.btn-mini { .btn-group-vertical { display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } .btn-group-vertical .btn { -- cgit v1.2.3 From 01572f00bb5671aaab1763b85c9608c10362aef4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Aug 2012 12:27:45 -0700 Subject: ie7 button group and button toggle padding changes --- 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 20a43ccbd..0664207ae 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3423,9 +3423,9 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn + .dropdown-toggle { - *padding-top: 4px; + *padding-top: 5px; padding-right: 8px; - *padding-bottom: 4px; + *padding-bottom: 5px; padding-left: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3433,17 +3433,21 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn-mini + .dropdown-toggle { + *padding-top: 2px; padding-right: 5px; + *padding-bottom: 2px; padding-left: 5px; } .btn-group > .btn-small + .dropdown-toggle { - *padding-top: 4px; + *padding-top: 5px; *padding-bottom: 4px; } .btn-group > .btn-large + .dropdown-toggle { + *padding-top: 7px; padding-right: 12px; + *padding-bottom: 7px; padding-left: 12px; } -- cgit v1.2.3