fix specificity on pills

diff --git a/bootstrap.css b/bootstrap.css
index 79fe4826cf4a3171a66cc3c58ad5194c51e48e8b..1c04bc09c907b83b2e3cbd88f54eaf83954162a0 100644 (file)
--- 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: Sun Dec 11 00:58:00 PST 2011
+ * Date: Sun Dec 11 01:03:44 PST 2011
  */
 html, body {
   margin: 0;
@@ -2074,7 +2074,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 > li > a {
   padding: 0 15px;
   margin: 5px 3px 5px 0;
   line-height: 30px;
@@ -2083,7 +2083,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-border-radius: 15px;
   border-radius: 15px;
 }
-.pills > a:hover {
+.pills > li > a:hover {
   color: #ffffff;
   text-decoration: none;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 48cc90703e23238850ec9fd90fe4dc6dcc593c4b..b9e7dd1ee588c38df122e59b4f988c576f89049f 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -276,7 +276,7 @@ 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>li>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>li>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;}

diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less
index 26c62c950a7e9393b32a55e5f0d6c76a632604d2..23ba9ccfac383f79cad79fb738e7075661a28abb 100644 (file)
--- a/lib/tabs-pills.less
+++ b/lib/tabs-pills.less
@@ -182,7 +182,7 @@
 
 // Pills
 .pills {
-  > a {
+  > li > a {
     padding: 0 15px;
     margin: 5px 3px 5px 0;
     line-height: 30px;