diff options
| author | Jacob Thornton <[email protected]> | 2012-01-28 15:42:07 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-28 15:42:07 -0800 |
| commit | b8a683d7f250a11d349a3e5de0d75ace9d67df0c (patch) | |
| tree | 5a3436730a0d61efd223bc04182dd75b17516cf5 /docs | |
| parent | ea1c21d62d66b929be9fcdf389d4d5835c1e6546 (diff) | |
| download | bootstrap-b8a683d7f250a11d349a3e5de0d75ace9d67df0c.tar.xz bootstrap-b8a683d7f250a11d349a3e5de0d75ace9d67df0c.zip | |
turn off brand hover for now + get nav toggling in mobile
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 10 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | docs/base-css.html | 54 | ||||
| -rw-r--r-- | docs/components.html | 54 | ||||
| -rw-r--r-- | docs/download.html | 54 | ||||
| -rw-r--r-- | docs/examples.html | 54 | ||||
| -rw-r--r-- | docs/index.html | 54 | ||||
| -rw-r--r-- | docs/javascript.html | 54 | ||||
| -rw-r--r-- | docs/less.html | 54 | ||||
| -rw-r--r-- | docs/scaffolding.html | 54 | ||||
| -rw-r--r-- | docs/templates/layout.mustache | 54 | ||||
| -rw-r--r-- | docs/upgrading.html | 54 |
12 files changed, 287 insertions, 264 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 3731713e8..631c904e7 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,9 +86,6 @@ width: auto; margin: 0; } - .btn-navbar { - display: block; - } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -258,6 +255,13 @@ padding-left: 10px; padding-right: 10px; } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } } /* @media (min-width: 1210px) { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e538be2a4..e928bb6d1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 3px; } .navbar .brand:hover { - color: #ffffff; text-decoration: none; } .navbar .brand { diff --git a/docs/base-css.html b/docs/base-css.html index aa0ac664f..c68391261 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class="active"> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class="active"> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/components.html b/docs/components.html index f584d90bd..a2fac7360 100644 --- a/docs/components.html +++ b/docs/components.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class="active"> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class="active"> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/download.html b/docs/download.html index 22feac344..5bcce7ced 100644 --- a/docs/download.html +++ b/docs/download.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class="active"> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class="active"> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/examples.html b/docs/examples.html index a43b5bec7..70a1a54dd 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/index.html b/docs/index.html index bb63674a8..89f5accd6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class="active"> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class="active"> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/javascript.html b/docs/javascript.html index adc73d462..eb4a175c3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class="active"> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class="active"> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/less.html b/docs/less.html index 165852a3f..497a9dfe3 100644 --- a/docs/less.html +++ b/docs/less.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class="active"> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class="active"> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2b797ded7..14da044bb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class="active"> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class="active"> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 673673dff..7c0ab655b 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class="{{index}}"> - <a href="./index.html">{{_i}}Overview{{/i}}</a> - </li> - <li class="{{scaffolding}}"> - <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> - </li> - <li class="{{base-css}}"> - <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> - </li> - <li class="{{components}}"> - <a href="./components.html">{{_i}}Components{{/i}}</a> - </li> - <li class="{{javascript}}"> - <a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a> - </li> - <li class="{{less}}"> - <a href="./less.html">{{_i}}Using LESS{{/i}}</a> - </li> - <li class="{{download}}"> - <a href="./download.html">{{_i}}Customize{{/i}}</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class="{{index}}"> + <a href="./index.html">{{_i}}Overview{{/i}}</a> + </li> + <li class="{{scaffolding}}"> + <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> + </li> + <li class="{{base-css}}"> + <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> + </li> + <li class="{{components}}"> + <a href="./components.html">{{_i}}Components{{/i}}</a> + </li> + <li class="{{javascript}}"> + <a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a> + </li> + <li class="{{less}}"> + <a href="./less.html">{{_i}}Using LESS{{/i}}</a> + </li> + <li class="{{download}}"> + <a href="./download.html">{{_i}}Customize{{/i}}</a> + </li> + </ul> + </div> </div> </div> </div> diff --git a/docs/upgrading.html b/docs/upgrading.html index f1f2a4303..c0778d9d0 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -26,42 +26,44 @@ </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> - - + + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="i-bar"></span> <span class="i-bar"></span> <span class="i-bar"></span> </a> <a class="brand" href="./index.html">Bootstrap</a> - <ul class="nav"> - <li class=""> - <a href="./index.html">Overview</a> - </li> - <li class=""> - <a href="./scaffolding.html">Scaffolding</a> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - </li> - <li class=""> - <a href="./components.html">Components</a> - </li> - <li class=""> - <a href="./javascript.html">Javascript plugins</a> - </li> - <li class=""> - <a href="./less.html">Using LESS</a> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - </ul> + <div class="nav-collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Overview</a> + </li> + <li class=""> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li class=""> + <a href="./less.html">Using LESS</a> + </li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + </ul> + </div> </div> </div> </div> |