rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

backwards compat for old nav o_O

Browse Source
This commit is contained in:
Jacob Thornton 2011-09-02 00:17:13 -07:00
parent 0159524413
commit 0ed544a82e
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bootstrap-1.2.0.css vendored
View File

@ -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;
}

16
bootstrap-1.2.0.min.css vendored
View File

@ -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);}
.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav li{display:block;float:left;font-size:13px;}
.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;}
.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;}
.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.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;}
.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
.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;}
.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;}

2
lib/patterns.less
View File

@ -108,7 +108,7 @@
// Topbar Nav
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
.nav {
.topbar ul, .nav {
display: block;
float: left;
margin: 0 10px 0 0;