aboutsummaryrefslogtreecommitdiff
path: root/bootstrap-1.2.0.css
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-02 00:17:13 -0700
committerJacob Thornton <[email protected]>2011-09-02 00:17:13 -0700
commit0ed544a82ed8bf3758de2f57af1abd54202d38f3 (patch)
tree75d440e8789d4c51e768c5d059ed2b44679cc6c4 /bootstrap-1.2.0.css
parent0159524413f7a90b90cff50fa07d07b85380845d (diff)
downloadbootstrap-0ed544a82ed8bf3758de2f57af1abd54202d38f3.tar.xz
bootstrap-0ed544a82ed8bf3758de2f57af1abd54202d38f3.zip
backwards compat for old nav o_O
Diffstat (limited to 'bootstrap-1.2.0.css')
-rw-r--r--bootstrap-1.2.0.css33
1 files changed, 18 insertions, 15 deletions
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 7d51eb7e1..54ef13bc0 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: Thu Sep 1 22:54:55 PDT 2011
+ * Date: Fri Sep 2 00:16:56 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).
@@ -1194,60 +1194,63 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
}
-.nav {
+.topbar ul, .nav {
display: block;
float: left;
margin: 0 10px 0 0;
position: relative;
left: 0;
}
-.nav li {
+.topbar ul li, .nav li {
display: block;
float: left;
font-size: 13px;
}
-.nav a {
+.topbar ul a, .nav a {
display: block;
float: none;
padding: 10px 10px 11px;
line-height: 19px;
text-decoration: none;
}
-.nav a:hover {
+.topbar ul a:hover, .nav a:hover {
color: #fff;
text-decoration: none;
}
-.nav .active a {
+.topbar ul .active a, .nav .active a {
background-color: #222;
background-color: rgba(0, 0, 0, 0.5);
}
-.nav.secondary-nav {
+.topbar ul.secondary-nav, .nav.secondary-nav {
float: right;
margin-left: 10px;
margin-right: 0;
}
-.nav.secondary-nav .dropdown-menu {
+.topbar ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
right: 0;
}
-.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
+.topbar ul .dropdown-toggle:hover,
+.nav .dropdown-toggle:hover,
+.topbar ul .dropdown.open .dropdown-toggle,
+.nav .dropdown.open .dropdown-toggle {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
-.nav .dropdown-menu {
+.topbar ul .dropdown-menu, .nav .dropdown-menu {
background-color: #333;
}
-.nav .dropdown-menu .dropdown-toggle {
+.topbar ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle {
color: #fff;
}
-.nav .dropdown-menu .dropdown-toggle.open {
+.topbar ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
-.nav .dropdown-menu li a {
+.topbar ul .dropdown-menu li a, .nav .dropdown-menu li a {
color: #999;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
}
-.nav .dropdown-menu li a:hover {
+.topbar ul .dropdown-menu li a:hover, .nav .dropdown-menu li a:hover {
background-color: #191919;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
@@ -1259,7 +1262,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-image: linear-gradient(top, #292929, #191919);
color: #fff;
}
-.nav .dropdown-menu .divider {
+.topbar ul .dropdown-menu .divider, .nav .dropdown-menu .divider {
background-color: #222;
border-color: #444;
}