From c098225cd52e212911c6eb1b71a23b7e8eb726ad Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 2 Sep 2011 00:26:58 -0700 Subject: [PATCH] this works O_O --- bootstrap-1.2.0.css | 32 ++++++++++++++++---------------- bootstrap-1.2.0.min.css | 16 ++++++++-------- lib/patterns.less | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 9748af278e..507a4d53f6 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: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). @@ -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)); @@ -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; } diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index 7bcfa148b9..08cee01352 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -184,14 +184,14 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar input::-webkit-input-placeholder{color:#e6e6e6;} .topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;} .topbar input:focus,.topbar input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-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{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar>ul li,.nav li{display:block;float:left;font-size:13px;} -.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{color:#fff;text-decoration:none;} -.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{float:right;margin-left:10px;margin-right:0;}.topbar>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;} -.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);} -.topbar>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.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{background:#444;background:rgba(255, 255, 255, 0.05);} -.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{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} -.topbar>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} +.topbar h3~ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar h3~ul li,.nav li{display:block;float:left;font-size:13px;} +.topbar h3~ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar h3~ul a:hover,.nav a:hover{color:#fff;text-decoration:none;} +.topbar h3~ul .active a,.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.topbar h3~ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar h3~ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;} +.topbar h3~ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar h3~ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.topbar h3~ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar h3~ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#fff;}.topbar h3~ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} +.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 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));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} +.topbar h3~ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} .dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} diff --git a/lib/patterns.less b/lib/patterns.less index 2e1a250a5a..eeeb214fd6 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -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; -- 2.47.2