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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 604ba03d39534ddc0a24c7a32baa27a6c6fa2396..69849219e82ab166703c10544a9139ffc673888c 100644 (file)
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 c0a7520d88456bb9a88b61573dea127d229f5614..b4d9d80c6b9f2213994f3411eb574bc76df873d5 100644 (file)
--- 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 e510620827c619b5da3e90181c62a61c8a49cd30..651b6f2f9f7347331d903048a429f2f79d0d32d7 100644 (file)
--- 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 eed0ff2d6898c2232c4552db9250f0abbae0959f..297676f4909d2469dde93ef5644cf1a7f51a9bc3 100644 (file)
--- 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 {