mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-01 09:22:55 +02:00
set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins)
This commit is contained in:
Binary file not shown.
4
docs/assets/css/bootstrap-responsive.css
vendored
4
docs/assets/css/bootstrap-responsive.css
vendored
@@ -174,7 +174,7 @@
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
}
|
||||
.container {
|
||||
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
|
||||
width: 724px;
|
||||
}
|
||||
.span1 {
|
||||
@@ -607,7 +607,7 @@
|
||||
float: left;
|
||||
margin-left: 30px;
|
||||
}
|
||||
.container {
|
||||
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
|
||||
width: 1170px;
|
||||
}
|
||||
.span1 {
|
||||
|
5
docs/assets/css/bootstrap.css
vendored
5
docs/assets/css/bootstrap.css
vendored
@@ -134,7 +134,7 @@ a:hover {
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
}
|
||||
.container {
|
||||
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
|
||||
width: 940px;
|
||||
}
|
||||
.span1 {
|
||||
@@ -2698,6 +2698,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
|
||||
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.navbar .container {
|
||||
width: auto;
|
||||
}
|
||||
.btn-navbar {
|
||||
display: none;
|
||||
float: right;
|
||||
|
@@ -873,7 +873,7 @@
|
||||
<p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container" style="width: auto;">
|
||||
<div class="container">
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
|
2
docs/templates/pages/components.mustache
vendored
2
docs/templates/pages/components.mustache
vendored
@@ -797,7 +797,7 @@
|
||||
<p>{{_i}}An example of a static (not fixed to the top) navbar with project name, navigation, and search form.{{/i}}</p>
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container" style="width: auto;">
|
||||
<div class="container">
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
|
Reference in New Issue
Block a user