tons of docs cleanup in css, adding subnav to official components

This commit is contained in:
Mark Otto
2012-06-24 20:26:48 -07:00
parent 160fe7ca59
commit 71669dda63
23 changed files with 301 additions and 239 deletions

1
less/bootstrap.less vendored
View File

@@ -41,6 +41,7 @@
// Components: Nav
@import "navs.less";
@import "navbar.less";
@import "subnav.less";
@import "breadcrumbs.less";
@import "pagination.less";
@import "pager.less";

View File

@@ -191,7 +191,6 @@
float: right; // redeclare due to specificity
}
.navbar .nav > li {
display: block;
float: left;
}
@@ -200,7 +199,7 @@
float: none;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
padding: ((@navbarHeight - @elementHeight) / 2 - 1) 10px ((@navbarHeight - @elementHeight) / 2 + 1);
padding: ((@navbarHeight - @elementHeight) / 2 - 1) 12px ((@navbarHeight - @elementHeight) / 2 + 1);
line-height: 19px;
color: @navbarLinkColor;
text-decoration: none;
@@ -262,7 +261,7 @@
padding: 7px 10px;
margin-left: 5px;
margin-right: 5px;
.buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
.buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
}
.navbar .btn-navbar .icon-bar {

View File

@@ -43,6 +43,7 @@
}
// NAV LIST
// --------

View File

@@ -43,7 +43,7 @@
// Modals
.modal {
position: absolute;
position: fixed;
top: 10px;
left: 10px;
right: 10px;

96
less/subnav.less Normal file
View File

@@ -0,0 +1,96 @@
/* Subnav
-------------------------------------------------- */
/* Base
------------------------- */
.subnav {
width: 100%;
height: @subnavHeight;
#gradient > .vertical(@subnavBackgroundHighlight, @subnavBackground);
border: 1px solid @subnavBorder;
-webkit-border-radius: @subnavBorderRadius;
-moz-border-radius: @subnavBorderRadius;
border-radius: @subnavBorderRadius;
}
/* Nav links
------------------------- */
.subnav .nav {
margin-bottom: 0; // remove default bottom margin of .nav
}
.subnav .nav > li {
float: left;
}
.subnav .nav > li > a {
padding: 8px 12px;
line-height: 20px;
border-left: 1px solid @subnavBackgroundHighlight;
border-right: 1px solid @subnavBorder;
}
.subnav .nav > .active > a,
.subnav .nav > .active > a:hover {
padding-left: 13px;
color: #777;
background-color: #e9e9e9;
border-right-color: #ddd;
border-left: 0;
-webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
}
.subnav .nav > .active > a .caret,
.subnav .nav > .active > a:hover .caret {
border-top-color: #777;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
border-left: 0;
padding-left: 12px;
-webkit-border-radius: @subnavBorderRadius 0 0 @subnavBorderRadius;
-moz-border-radius: @subnavBorderRadius 0 0 @subnavBorderRadius;
border-radius: @subnavBorderRadius 0 0 @subnavBorderRadius;
}
.subnav .nav > li:last-child > a {
border-right: 0;
}
/* Dropdown menus get matching border-radius
.subnav .dropdown-menu {
-webkit-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
-moz-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
}
/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
@media (min-width: 980px) {
.subnav-fixed {
position: fixed;
top: 40px;
left: 0;
right: 0;
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
max-width: 780px;
margin: 0 auto;
padding: 0 1px;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
}

View File

@@ -168,6 +168,16 @@
@navbarBrandColor: @navbarLinkColor;
// Subnav
// -------------------------
@subnavHeight: 36px;
@subnavBackground: #eeeeee;
@subnavBackgroundHighlight: #f5f5f5;
@subnavBorder: #e5e5e5;
@subnavBorderRadius: 4px;
// Hero unit
// -------------------------
@heroUnitBackground: @grayLighter;