move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index fc1746408d3f58b47b0861a6daf68dde108f1871..966ce6d2eea898764e22654781fc5a6cd26c96b9 100644 (file)
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.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 Sep 11 18:43:05 PDT 2011
+ * Date: Sun Sep 11 19:59:57 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).
@@ -1304,10 +1304,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #ffffff;
   text-decoration: none;
 }
-.topbar .brand, .topbar h3 {
+.topbar h3 {
   position: relative;
 }
-.topbar .brand a, .topbar h3 a {
+.topbar h3 a, .topbar .brand {
   float: left;
   display: block;
   padding: 8px 20px 12px;

diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 66337455c0ee924d1564efd71c2827624387b41d..37c3f2a239a5da6f356f7c64c71d6a9ab2f49a62 100644 (file)
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -215,7 +215,8 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
 table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
 .topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
 .topbar a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
-.topbar .brand,.topbar h3{position:relative;}.topbar .brand a,.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
+.topbar h3{position:relative;}
+.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
 .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;}
 .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
 .topbar form.pull-right{float:right;}

diff --git a/docs/index.html b/docs/index.html
index 560343ed6dd902329235c4a6e8dffd3ff1e33304..f9bcb784e4c6f035e00830835f21a9efa46dced1 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
     <div class="topbar">
       <div class="topbar-inner">
         <div class="container">
-          <h3><a href="#">Bootstrap</a></h3>
+          <a class="brand" href="#">Bootstrap</a>
           <ul class="nav">
             <li class="active"><a href="#overview">Overview</a></li>
             <li><a href="#about">About</a></li>

diff --git a/lib/patterns.less b/lib/patterns.less
index 901ac12de18ace8c58b0c9c955ba688521cf8f91..88f56ea597193b330e1f43b05db7ac51a2c16624 100644 (file)
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -33,19 +33,19 @@
 
   // Website name
   // h3 left for backwards compatibility
-  .brand,
   h3 {
     position: relative;
-    a {
-      float: left;
-      display: block;
-      padding: 8px 20px 12px;
-      margin-left: -20px; // negative indent to left-align the text down the page
-      color: @white;
-      font-size: 20px;
-      font-weight: 200;
-      line-height: 1;
-    }
+  }
+  h3 a,
+  .brand {
+    float: left;
+    display: block;
+    padding: 8px 20px 12px;
+    margin-left: -20px; // negative indent to left-align the text down the page
+    color: @white;
+    font-size: 20px;
+    font-weight: 200;
+    line-height: 1;
   }
 
   // Plain text in topbar