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

updates to responsive and docs for responsive navbar

Browse Source
This commit is contained in:
Mark Otto 2012-01-28 22:03:14 -08:00
parent f1e520badd
commit 59d9983ebc
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
View File

@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small {
.btn-navbar .i-bar + .i-bar { .btn-navbar .i-bar + .i-bar {
margin-top: 3px; margin-top: 3px;
} }
.nav-collapse.collapse {
height: auto !important;
}
.navbar .brand:hover { .navbar .brand:hover {
text-decoration: none; text-decoration: none;
} }

7
docs/assets/css/docs.css
View File

@ -671,11 +671,6 @@ form.well {
} }
} }
@media (min-width: 940px) {
.nav-collapse.collapse {
height: auto !important;
}
}
@media (max-width: 768px) { @media (max-width: 768px) {
@ -768,6 +763,7 @@ form.well {
} }
@media (max-width: 940px) { @media (max-width: 940px) {
/* Unfloat brand */ /* Unfloat brand */
@ -780,6 +776,7 @@ form.well {
} }
/* LARGE DESKTOP SCREENS */ /* LARGE DESKTOP SCREENS */
@media (min-width: 1210px) { @media (min-width: 1210px) {

3
docs/components.html
View File

@ -766,6 +766,9 @@
</div> </div>
</div> </div>
</pre> </pre>
<div class="alert alert-info">
<strong>Heads up!</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a>.
</div>
</div><!-- /.span --> </div><!-- /.span -->
<div class="span4"> <div class="span4">

3
docs/templates/pages/components.mustache vendored
View File

@ -694,6 +694,9 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
<div class="alert alert-info">
<strong>{{_i}}Heads up!{{/i}}</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a>.
</div>
</div><!-- /.span --> </div><!-- /.span -->
<div class="span4"> <div class="span4">

4
less/navbar.less
View File

@ -38,6 +38,10 @@
.btn-navbar .i-bar + .i-bar { .btn-navbar .i-bar + .i-bar {
margin-top: 3px; margin-top: 3px;
} }
.nav-collapse.collapse {
height: auto !important; // Required to be !important to override native collapse plugin
}
// Brand, links, text, and buttons // Brand, links, text, and buttons
.navbar { .navbar {