2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

initial pass at removing navbar-inner from .navbar component

This commit is contained in:
Mark Otto
2012-09-25 22:48:02 -07:00
parent f12946be5a
commit c59e5251e1
15 changed files with 604 additions and 727 deletions
+10 -32
View File
@@ -9,17 +9,10 @@
// Base class and wrapper
.navbar {
overflow: visible;
padding: 0 20px;
margin-bottom: @baseLineHeight;
color: @navbarText;
}
// Inner for background effects
// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
min-height: @navbarHeight;
padding-left: 20px;
padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
background-color: @navbarBackground;
border: 1px solid @navbarBorder;
.border-radius(4px);
.box-shadow(0 1px 4px rgba(0,0,0,.065));
@@ -150,9 +143,7 @@
.navbar-static-top {
position: static;
margin-bottom: 0; // remove 18px margin for default navbar
.navbar-inner {
.border-radius(0);
}
.border-radius(0);
}
@@ -168,20 +159,14 @@
left: 0;
z-index: @zindexFixedNavbar;
margin-bottom: 0; // remove 18px margin for default navbar
}
.navbar-fixed-top .navbar-inner,
.navbar-static-top .navbar-inner {
border-width: 0 0 1px;
}
.navbar-fixed-bottom .navbar-inner {
border-width: 1px 0 0;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding-left: 0;
padding-right: 0;
.border-radius(0);
}
.navbar-fixed-bottom {
border-width: 1px 0 0;
}
// Reset container width
// Required here as we reset the width earlier on and the grid mixins don't override early enough
@@ -197,17 +182,13 @@
}
.navbar-fixed-top,
.navbar-static-top {
.navbar-inner {
.box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
}
.box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
}
// Fixed to bottom
.navbar-fixed-bottom {
bottom: 0;
.navbar-inner {
.box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
}
.box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
}
@@ -376,11 +357,8 @@
.navbar-inverse {
color: @navbarInverseText;
.navbar-inner {
#gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
border-color: @navbarInverseBorder;
}
background-color: @navbarInverseBackground;
border-color: @navbarInverseBorder;
.brand,
.nav > li > a {
+3 -3
View File
@@ -24,8 +24,8 @@
.navbar-fixed-bottom {
margin-top: @baseLineHeight;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
.navbar-fixed-top,
.navbar-fixed-bottom {
padding: 5px;
}
.navbar .container {
@@ -154,7 +154,7 @@
// STATIC NAVBAR
// -------------
.navbar-static .navbar-inner {
.navbar-static {
padding-left: 10px;
padding-right: 10px;
}