From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 08:21:47 +0000 (-0700)
Subject: introduce .navbar-link to resolve issue with buttons in .navbar-text
X-Git-Tag: v2.0.3~5^2~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c5c29ada2430c884888c9138ba09b0030584d17;p=thirdparty%2Fbootstrap.git

introduce .navbar-link to resolve issue with buttons in .navbar-text
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 604ba03d39..69849219e8 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c0a7520d88..b4d9d80c6b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2896,6 +2896,12 @@ input[type="submit"].btn.btn-mini {
   margin-bottom: 0;
   line-height: 40px;
 }
+.navbar .navbar-link {
+  color: #999999;
+}
+.navbar .navbar-link:hover {
+  color: #ffffff;
+}
 .navbar .btn,
 .navbar .btn-group {
   margin-top: 5px;
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html
index e510620827..651b6f2f9f 100644
--- a/docs/examples/fluid.html
+++ b/docs/examples/fluid.html
@@ -50,7 +50,7 @@
               <li><a href="#about">About</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
-            <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
+            <p class="navbar-text pull-right">Logged in as <a class="navbar-link" href="#">username</a></p>
           </div><!--/.nav-collapse -->
         </div>
       </div>
diff --git a/less/navbar.less b/less/navbar.less
index eed0ff2d68..297676f490 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -81,6 +81,13 @@
     margin-bottom: 0;
     line-height: @navbarHeight;
   }
+  // Janky solution for now to account for links outside the .nav
+  .navbar-link {
+    color: @navbarLinkColor;
+    &:hover {
+      color: @navbarLinkColorHover;
+    }
+  }
   // Buttons in navbar
   .btn,
   .btn-group {