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

Conflicts:
	docs/assets/bootstrap.zip

3 files changed, 9 insertions, 6 deletions

diff --git a/less/mixins.less b/less/mixins.less
index 0074e8924..a118fe7c4 100644
--- a/less/mixins.less
+++ b/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;
 }
 
 
diff --git a/less/navbar.less b/less/navbar.less
index 8eb1332ae..cda6721e3 100644
--- a/less/navbar.less
+++ b/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 {
diff --git a/less/variables.less b/less/variables.less
index 94c3a0667..812587fcd 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -154,6 +154,7 @@
 @navbarSearchBackgroundFocus:     @white;
 @navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
 @navbarSearchPlaceholderColor:    #ccc;
+@navbarBrandColor:                @navbarLinkColor;
 
 
 // Hero unit