From 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 2 Sep 2011 00:21:55 -0700 Subject: > seems to work O_O --- bootstrap-1.2.0.css | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 54ef13bc0..9748af278 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 00:16:56 PDT 2011 + * Date: Fri Sep 2 00:21:51 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,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 > ul, .nav { display: block; float: left; margin: 0 10px 0 0; position: relative; left: 0; } -.topbar ul li, .nav li { +.topbar > ul li, .nav li { display: block; float: left; font-size: 13px; } -.topbar ul a, .nav a { +.topbar > 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 > ul a:hover, .nav a:hover { color: #fff; text-decoration: none; } -.topbar ul .active a, .nav .active a { +.topbar > 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 > 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 > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { right: 0; } -.topbar ul .dropdown-toggle:hover, +.topbar > ul .dropdown-toggle:hover, .nav .dropdown-toggle:hover, -.topbar ul .dropdown.open .dropdown-toggle, +.topbar > 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 > ul .dropdown-menu, .nav .dropdown-menu { background-color: #333; } -.topbar ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle { +.topbar > 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 > 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 > 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 > 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)); @@ -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 > ul .dropdown-menu .divider, .nav .dropdown-menu .divider { background-color: #222; border-color: #444; } -- cgit v1.2.3