From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 3 Sep 2011 06:09:59 +0000 (-0700)
Subject: adding link support to regular text in the topbar
X-Git-Tag: v1.3.0~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168551cd4f2139bbd050864c4231baa7e7b796dc;p=thirdparty%2Fbootstrap.git

adding link support to regular text in the topbar
---

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index a4f671ebf3..1280c51487 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep  2 22:56:14 PDT 2011
+ * Date: Fri Sep  2 23:08:36 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1169,6 +1169,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   margin: 0;
   line-height: 40px;
 }
+.topbar p a:hover {
+  background-color: transparent;
+}
 .topbar form {
   float: left;
   margin: 5px 0 0 0;
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index a238cc6d3e..8968aba963 100644
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -183,7 +183,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
 .topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
 .topbar a:hover,.topbar ul .active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
 .topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
-.topbar p{margin:0;line-height:40px;}
+.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;}
 .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
 .topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;}
 .topbar input::-webkit-input-placeholder{color:#e6e6e6;}
diff --git a/examples/fluid.html b/examples/fluid.html
index 63ffc75ef9..7e9fed0c38 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -37,7 +37,7 @@
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
           </ul>
-          <p class="pull-right">Logged in as username</p>
+          <p class="pull-right">Logged in as <a href="#">username</a></p>
         </div>
       </div>
     </div>
diff --git a/lib/patterns.less b/lib/patterns.less
index eccda9359a..72ca3b559a 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -50,6 +50,9 @@
   p {
     margin: 0;
     line-height: 40px;
+    a:hover {
+      background-color: transparent;
+    }
   }
 
   // Search Form