Skip to content

Commit

Permalink
this works O_O
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Sep 2, 2011
1 parent 3f1706f commit c098225
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
32 changes: 16 additions & 16 deletions bootstrap-1.2.0.css
Expand Up @@ -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 00:21:51 PDT 2011
* Date: Fri Sep 2 00:26:54 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).
Expand Down Expand Up @@ -1194,63 +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);
}
.topbar > ul, .nav {
.topbar h3 ~ ul, .nav {
display: block;
float: left;
margin: 0 10px 0 0;
position: relative;
left: 0;
}
.topbar > ul li, .nav li {
.topbar h3 ~ ul li, .nav li {
display: block;
float: left;
font-size: 13px;
}
.topbar > ul a, .nav a {
.topbar h3 ~ ul a, .nav a {
display: block;
float: none;
padding: 10px 10px 11px;
line-height: 19px;
text-decoration: none;
}
.topbar > ul a:hover, .nav a:hover {
.topbar h3 ~ ul a:hover, .nav a:hover {
color: #fff;
text-decoration: none;
}
.topbar > ul .active a, .nav .active a {
.topbar h3 ~ ul .active a, .nav .active a {
background-color: #222;
background-color: rgba(0, 0, 0, 0.5);
}
.topbar > ul.secondary-nav, .nav.secondary-nav {
.topbar h3 ~ ul.secondary-nav, .nav.secondary-nav {
float: right;
margin-left: 10px;
margin-right: 0;
}
.topbar > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
.topbar h3 ~ ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
right: 0;
}
.topbar > ul .dropdown-toggle:hover,
.topbar h3 ~ ul .dropdown-toggle:hover,
.nav .dropdown-toggle:hover,
.topbar > ul .dropdown.open .dropdown-toggle,
.topbar h3 ~ ul .dropdown.open .dropdown-toggle,
.nav .dropdown.open .dropdown-toggle {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
.topbar > ul .dropdown-menu, .nav .dropdown-menu {
.topbar h3 ~ ul .dropdown-menu, .nav .dropdown-menu {
background-color: #333;
}
.topbar > ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle {
.topbar h3 ~ ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle {
color: #fff;
}
.topbar > ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open {
.topbar h3 ~ ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
.topbar > ul .dropdown-menu li a, .nav .dropdown-menu li a {
.topbar h3 ~ ul .dropdown-menu li a, .nav .dropdown-menu li a {
color: #999;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
}
.topbar > ul .dropdown-menu li a:hover, .nav .dropdown-menu li a:hover {
.topbar h3 ~ 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));
Expand All @@ -1262,7 +1262,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-image: linear-gradient(top, #292929, #191919);
color: #fff;
}
.topbar > ul .dropdown-menu .divider, .nav .dropdown-menu .divider {
.topbar h3 ~ ul .dropdown-menu .divider, .nav .dropdown-menu .divider {
background-color: #222;
border-color: #444;
}
Expand Down
16 changes: 8 additions & 8 deletions bootstrap-1.2.0.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/patterns.less
Expand Up @@ -108,7 +108,7 @@

// Topbar Nav
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
.topbar > ul, .nav {
.topbar h3 ~ ul, .nav {
display: block;
float: left;
margin: 0 10px 0 0;
Expand Down

0 comments on commit c098225

Please sign in to comment.