tweaks and increase specificity of pills and active classes

diff --git a/bootstrap.css b/bootstrap.css
index 6cfb0fbf908dbcf641b99c2fc7d044dc422ee78d..b7a820f716035712c9220a046a1816058ad85ffe 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: 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 0be081c0af520e439c0ff79186b94be831aae9b9..3a77a1df226c750af20fda4c67bb5a2016805227 100644 (file)
--- 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 c2b9d12d7de68475ef40210b662b5306edd4c428..0a63c19103496b93f13941ac48309d9cca9792ad 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -57,7 +57,7 @@
             <p class="lead">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.</p>
             <p class="download-info">
               <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
-              <a href="./scaffolding.html" class="btn btn-large">Get started</a>
+              <a href="./scaffolding.html" class="btn btn-large">Get started &rarr;</a>
               Currently v2.0.0
             </p>
 

diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less
index ad6459c0d94e694463b9ee16397340b3b722f139..26c62c950a7e9393b32a55e5f0d6c76a632604d2 100644 (file)
--- 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;