Commit 2674210f authored by Mark Otto's avatar Mark Otto

move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7

parent 6bc867ed
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 /* 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). * 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 { ...@@ -1304,10 +1304,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
} }
.topbar .brand, .topbar h3 { .topbar h3 {
position: relative; position: relative;
} }
.topbar .brand a, .topbar h3 a { .topbar h3 a, .topbar .brand {
float: left; float: left;
display: block; display: block;
padding: 8px 20px 12px; padding: 8px 20px 12px;
......
...@@ -215,7 +215,8 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} ...@@ -215,7 +215,8 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} 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{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 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 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{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;} .topbar form.pull-right{float:right;}
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div class="topbar"> <div class="topbar">
<div class="topbar-inner"> <div class="topbar-inner">
<div class="container"> <div class="container">
<h3><a href="#">Bootstrap</a></h3> <a class="brand" href="#">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<li class="active"><a href="#overview">Overview</a></li> <li class="active"><a href="#overview">Overview</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
// Website name // Website name
// h3 left for backwards compatibility // h3 left for backwards compatibility
.brand,
h3 { h3 {
position: relative; position: relative;
a { }
h3 a,
.brand {
float: left; float: left;
display: block; display: block;
padding: 8px 20px 12px; padding: 8px 20px 12px;
...@@ -46,7 +47,6 @@ ...@@ -46,7 +47,6 @@
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
} }
}
// Plain text in topbar // Plain text in topbar
p { p {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment