aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-11 20:00:45 -0700
committerMark Otto <[email protected]>2011-09-11 20:00:45 -0700
commit2674210ff06a9ceaaa98263a2cbe2246fcd21111 (patch)
treeb4c62c2548e285e869d0f0489910d111c42a0f68
parent6bc867ed5c20972801226467feb63e85c9dec060 (diff)
downloadbootstrap-2674210ff06a9ceaaa98263a2cbe2246fcd21111.tar.xz
bootstrap-2674210ff06a9ceaaa98263a2cbe2246fcd21111.zip
move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7
-rw-r--r--bootstrap-1.3.0.css6
-rw-r--r--bootstrap-1.3.0.min.css3
-rw-r--r--docs/index.html2
-rw-r--r--lib/patterns.less22
4 files changed, 17 insertions, 16 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index fc1746408..966ce6d2e 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.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: Sun Sep 11 18:43:05 PDT 2011
+ * Date: Sun Sep 11 19:59:57 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).
@@ -1304,10 +1304,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #ffffff;
text-decoration: none;
}
-.topbar .brand, .topbar h3 {
+.topbar h3 {
position: relative;
}
-.topbar .brand a, .topbar h3 a {
+.topbar h3 a, .topbar .brand {
float: left;
display: block;
padding: 8px 20px 12px;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 66337455c..37c3f2a23 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -215,7 +215,8 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
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 .brand,.topbar h3{position:relative;}.topbar .brand a,.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 h3{position:relative;}
+.topbar h3 a,.topbar .brand{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 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 form.pull-right{float:right;}
diff --git a/docs/index.html b/docs/index.html
index 560343ed6..f9bcb784e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
<div class="topbar">
<div class="topbar-inner">
<div class="container">
- <h3><a href="#">Bootstrap</a></h3>
+ <a class="brand" href="#">Bootstrap</a>
<ul class="nav">
<li class="active"><a href="#overview">Overview</a></li>
<li><a href="#about">About</a></li>
diff --git a/lib/patterns.less b/lib/patterns.less
index 901ac12de..88f56ea59 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -33,19 +33,19 @@
// Website name
// h3 left for backwards compatibility
- .brand,
h3 {
position: relative;
- a {
- float: left;
- display: block;
- padding: 8px 20px 12px;
- margin-left: -20px; // negative indent to left-align the text down the page
- color: @white;
- font-size: 20px;
- font-weight: 200;
- line-height: 1;
- }
+ }
+ h3 a,
+ .brand {
+ float: left;
+ display: block;
+ padding: 8px 20px 12px;
+ margin-left: -20px; // negative indent to left-align the text down the page
+ color: @white;
+ font-size: 20px;
+ font-weight: 200;
+ line-height: 1;
}
// Plain text in topbar