Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

Conflicts:
	docs/assets/bootstrap.zip

docs/assets/css/bootstrap-responsive.css

@@ -19,9 +19,11 @@
   clear: both;
 }
 .hide-text {
-  overflow: hidden;
-  text-indent: 100%;
-  white-space: nowrap;
+  border: 0;
+  font: 0/0 a;
+  text-shadow: none;
+  color: transparent;
+  background-color: transparent;
 }
 .input-block-level {
   display: block;

docs/assets/css/bootstrap.css

@@ -113,9 +113,11 @@ textarea {
   clear: both;
 }
 .hide-text {
-  overflow: hidden;
-  text-indent: 100%;
-  white-space: nowrap;
+  border: 0;
+  font: 0/0 a;
+  text-shadow: none;
+  color: transparent;
+  background-color: transparent;
 }
 .input-block-level {
   display: block;
@@ -2866,7 +2868,7 @@ input[type="submit"].btn.btn-mini {
   font-size: 20px;
   font-weight: 200;
   line-height: 1;
-  color: #ffffff;
+  color: #999999;
 }
 .navbar .navbar-text {
   margin-bottom: 0;

docs/download.html

@@ -335,6 +335,8 @@
       <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
+      <label>@navbarBrandColor</label>
+      <input type="text" class="span3" placeholder="@navbarLinkColor">
 
       <h3>Dropdowns</h3>
       <label>@dropdownBackground</label>

docs/templates/pages/download.mustache

@@ -259,6 +259,8 @@
       <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
+      <label>@navbarBrandColor</label>
+      <input type="text" class="span3" placeholder="@navbarLinkColor">
 
       <h3>{{_i}}Dropdowns{{/i}}</h3>
       <label>@dropdownBackground</label>

less/mixins.less

@@ -98,13 +98,15 @@
   white-space: nowrap;
 }
 
-// New image replacement
+// CSS image replacement
 // -------------------------
-// Source: http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 .hide-text {
-  overflow: hidden;
-  text-indent: 100%;
-  white-space: nowrap;
+  border: 0;
+  font: 0/0 a;
+  text-shadow: none;
+  color: transparent;
+  background-color: transparent;
 }
 
 

less/navbar.less

@@ -74,7 +74,7 @@
     font-size: 20px;
     font-weight: 200;
     line-height: 1;
-    color: @white;
+    color: @navbarBrandColor;
   }
   // Plain text in topbar
   .navbar-text {

less/variables.less

@@ -154,6 +154,7 @@
 @navbarSearchBackgroundFocus:     @white;
 @navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
 @navbarSearchPlaceholderColor:    #ccc;
+@navbarBrandColor:                @navbarLinkColor;
 
 
 // Hero unit