fix docs for fluid layout, update topbar to fix active text color for links

4 files changed, 7 insertions, 7 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 5eb8a4a7c..e55d6d544 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: Sun Jan  8 01:50:02 PST 2012
+ * Date: Sun Jan  8 01:54:42 PST 2012
  */
 html, body {
   margin: 0;
@@ -1600,7 +1600,7 @@ i {
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
-.navbar .brand:hover, .navbar ul .active > a {
+.navbar .brand:hover, .navbar .nav .active > a {
   color: #ffffff;
   text-decoration: none;
   background-color: #333333;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 33e4f7f80..20c8f6539 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -315,7 +315,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;}
 .navbar{overflow:visible;}
 .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
-.navbar .brand:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
+.navbar .brand:hover,.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn{margin-top:5px;}
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index bf42d4468..10e5a43be 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -243,11 +243,11 @@
       </div>
 <pre class="prettyprint linenums">
 &lt;body&gt;
-  &lt;div class="fluid-container"&gt;
-    &lt;div class="sidebar"&gt;
+  &lt;div class="fluid-container sidebar-left"&gt;
+    &lt;div class="fluid-sidebar"&gt;
       ...
     &lt;/div&gt;
-    &lt;div class="content"&gt;
+    &lt;div class="fluid-content"&gt;
       ...
     &lt;/div&gt;
   &lt;/div&gt;
diff --git a/lib/navbar.less b/lib/navbar.less
index 8ee203307..70be434ba 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -21,7 +21,7 @@
 .navbar {
   // Hover and active states
   .brand:hover,
-  ul .active > a {
+  .nav .active > a {
     color: @white;
     text-decoration: none;
     background-color: @navBarBgStart;