diff options
| author | Mark Otto <[email protected]> | 2012-01-28 22:03:14 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 22:03:14 -0800 |
| commit | 59d9983ebcc889b5e5626d672311e92657bfe3e8 (patch) | |
| tree | a3966e11c8fca12add6b3b9d24eecb3f423ae440 /docs | |
| parent | f1e520badd51d01ebcd33758966ef868e5cdd1c2 (diff) | |
| download | bootstrap-59d9983ebcc889b5e5626d672311e92657bfe3e8.tar.xz bootstrap-59d9983ebcc889b5e5626d672311e92657bfe3e8.zip | |
updates to responsive and docs for responsive navbar
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 7 | ||||
| -rw-r--r-- | docs/components.html | 3 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ef8547f..e09e58a82 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar .i-bar + .i-bar { margin-top: 3px; } +.nav-collapse.collapse { + height: auto !important; +} .navbar .brand:hover { text-decoration: none; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f36fa76d6..7876f300a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -671,11 +671,6 @@ form.well { } } -@media (min-width: 940px) { - .nav-collapse.collapse { - height: auto !important; - } -} @media (max-width: 768px) { @@ -768,6 +763,7 @@ form.well { } + @media (max-width: 940px) { /* Unfloat brand */ @@ -780,6 +776,7 @@ form.well { } + /* LARGE DESKTOP SCREENS */ @media (min-width: 1210px) { diff --git a/docs/components.html b/docs/components.html index 710e7de77..f9f8db057 100644 --- a/docs/components.html +++ b/docs/components.html @@ -766,6 +766,9 @@ </div> </div> </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 class="span4"> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 5c91431fa..5cb914e32 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -694,6 +694,9 @@ </div> </div> </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 class="span4"> |