From: Mark Otto <otto@github.com>
Date: Fri, 3 May 2013 22:29:32 +0000 (-0700)
Subject: Fixes #7721: change @navbar-text to @navbar-color, along with inverse options
X-Git-Tag: v3.0.0-rc1~371
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee0789ff8f7ac0c60d8f326894fef5fd9db90adc;p=thirdparty%2Fbootstrap.git

Fixes #7721: change @navbar-text to @navbar-color, along with inverse options
---

diff --git a/docs/customize.html b/docs/customize.html
index e445ccab9d..710875b727 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -297,7 +297,7 @@ title: Customize and download
                 <input type="text" placeholder="@grayDarker">
                 <label>@navbar-background-highlight</label>
                 <input type="text" placeholder="@grayDark">
-                <label>@navbar-text</label>
+                <label>@navbar-color</label>
                 <input type="text" placeholder="@grayLight">
                 <label>@navbar-brand-color</label>
                 <input type="text" placeholder="@navbar-link-color">
diff --git a/less/navbar.less b/less/navbar.less
index 328d8c018c..bf9c3646a0 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -196,7 +196,7 @@
   }
 
   .navbar-text {
-    color: @navbar-inverse-text;
+    color: @navbar-inverse-color;
   }
 
   .navbar-nav {
diff --git a/less/variables.less b/less/variables.less
index 6cd5b2a485..37d51e16e7 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -166,7 +166,7 @@
 
 // Basics of a navbar
 @navbar-height:                    50px;
-@navbar-text:                      #777;
+@navbar-color:                     #777;
 @navbar-bg:                        #eee;
 
 // Navbar links
@@ -184,7 +184,7 @@
 @navbar-brand-hover-bg:            transparent;
 
 // Inverted navbar
-@navbar-inverse-text:                       @gray-light;
+@navbar-inverse-color:                       @gray-light;
 @navbar-inverse-bg:                         #222;
 
 // Inverted navbar links