fix tabs jitter bug when there is no active class

diff --git a/bootstrap.css b/bootstrap.css
index bcba5b4574689356318cb91891e6d259f2c1a9ac..8f1058535ee33d49118c95d00fb3254fff409031 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 Sep 16 09:47:29 PDT 2011
+ * Date: Fri Sep 16 10:13:51 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1591,22 +1591,23 @@ a.menu:after, .dropdown-toggle:after {
 .tabs > li > a {
   margin-right: 2px;
   padding: 0 15px;
-  line-height: 35px;
+  line-height: 36px;
+  border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
-  background-color: #eee;
-  border-bottom: 1px solid #ddd;
   text-decoration: none;
+  background-color: #eee;
+  border-color: #eee #eee #ddd;
 }
 .tabs > li.active > a {
-  background-color: #ffffff;
   padding: 0 14px;
-  border: 1px solid #ddd;
-  border-bottom: 0;
   color: #808080;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
 }
 .tabs .menu-dropdown, .tabs .dropdown-menu {
   top: 35px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 0e0c04b124c0ac9908fc210e5970c2424283821f..4b06450f99eb83e9a42b5af4315c1aba488abaf5 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -240,8 +240,8 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
 .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;}
 .tabs:after,.pills:after{clear:both;}
 .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
-.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
-.tabs>li.active>a{background-color:#ffffff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;}
+.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;}
+.tabs>li.active>a{padding:0 14px;color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;}
 .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
 .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;}

diff --git a/docs/index.html b/docs/index.html
index 1d20bc3a20f198dbdd8c7be35890a8275dc953be..1e446c72b99b292cd1b224463f8c90307165165b 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -1367,7 +1367,7 @@
     </div>
     <div class="span12">
       <ul class="tabs">
-        <li class="active"><a href="#">Home</a></li>
+        <li class=""><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
         <li><a href="#">Settings</a></li>

diff --git a/lib/patterns.less b/lib/patterns.less
index 543332086ec25a0a29bec42bea91f2b3c446b65e..cb92126aaad477ffc760119ddbfc84a1bddac7b2 100644 (file)
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -342,22 +342,22 @@ a.menu:after,
     position: relative; // For the dropdowns mostly
     top: 1px;
     > a {
-      margin-right: 2px;
       padding: 0 15px;
-      line-height: (@baseline * 2) - 1;
+      margin-right: 2px;
+      line-height: @baseline * 2;
+      border: 1px solid transparent;
       .border-radius(4px 4px 0 0);
       &:hover {
-        background-color: #eee;
-        border-bottom: 1px solid #ddd;
         text-decoration: none;
+        background-color: #eee;
+        border-color: #eee #eee #ddd;
       }
     }
     &.active > a {
+      color: @gray;
       background-color: @white;
-      padding: 0 14px;
       border: 1px solid #ddd;
-      border-bottom: 0;
-      color: @gray;
+      border-bottom-color: transparent;
     }
   }
   // first one for backwards compatibility