1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 12:40:58 +00:00

fix navbar container for default 940px grid per #2194

This commit is contained in:
Mark Otto 2012-02-27 22:34:25 -08:00
parent 6c9547f411
commit fbebb046f7
4 changed files with 9 additions and 1 deletions

Binary file not shown.

View File

@ -2740,6 +2740,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 940px;
}
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;
} }

View File

@ -502,7 +502,7 @@
margin-left: @gridGutterWidth; margin-left: @gridGutterWidth;
} }
// Set the container width, and reset it for fixed navbars // Set the container width, and override it for fixed navbars in media queries
.container, .container,
.navbar-fixed-top .container, .navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(12); } .navbar-fixed-bottom .container { .span(12); }

View File

@ -179,6 +179,11 @@
.border-radius(0); .border-radius(0);
} }
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
#grid > .core > .span(@gridColumns);
}
// Fixed to top // Fixed to top
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;