From d587845149471ad9ed07bc57c1a8652c54d17c55 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2011 22:21:08 -0800 Subject: [PATCH] tweaks and increase specificity of pills and active classes --- bootstrap.css | 8 ++++---- bootstrap.min.css | 4 ++-- docs/index.html | 2 +- lib/tabs-pills.less | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6cfb0fbf90..b7a820f716 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Dec 9 14:39:08 PST 2011 + * Date: Sat Dec 10 22:20:18 PST 2011 */ html, body { margin: 0; @@ -2062,7 +2062,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.pills a { +.pills > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -2071,13 +2071,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 15px; border-radius: 15px; } -.pills a:hover { +.pills > a:hover { color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #00438a; } -.pills .active a { +.pills .active > a { color: #ffffff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #0069d6; diff --git a/bootstrap.min.css b/bootstrap.min.css index 0be081c0af..3a77a1df22 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -274,8 +274,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} -.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} +.pills>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} diff --git a/docs/index.html b/docs/index.html index c2b9d12d7d..0a63c19103 100644 --- a/docs/index.html +++ b/docs/index.html @@ -57,7 +57,7 @@

Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.

Download on GitHub - Get started + Get started → Currently v2.0.0

diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less index ad6459c0d9..26c62c950a 100644 --- a/lib/tabs-pills.less +++ b/lib/tabs-pills.less @@ -182,7 +182,7 @@ // Pills .pills { - a { + > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -195,7 +195,7 @@ background-color: @linkColorHover; } } - .active a { + .active > a { color: @white; text-shadow: 0 1px 1px rgba(0,0,0,.25); background-color: @linkColor;