diff options
| author | Mark Otto <[email protected]> | 2012-01-28 18:39:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 18:39:36 -0800 |
| commit | 99ac6ca08ed27126d2ad1dd4d0e820205aab9c48 (patch) | |
| tree | 003fe6eb65fdfef470d48eadc316489f6081d8c8 /docs | |
| parent | e17c9249d2bef78355711ce305e1a8d36bd75c3e (diff) | |
| download | bootstrap-99ac6ca08ed27126d2ad1dd4d0e820205aab9c48.tar.xz bootstrap-99ac6ca08ed27126d2ad1dd4d0e820205aab9c48.zip | |
update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components.html | 29 | ||||
| -rw-r--r-- | docs/download.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 29 | ||||
| -rw-r--r-- | docs/templates/pages/download.mustache | 6 |
4 files changed, 58 insertions, 12 deletions
diff --git a/docs/components.html b/docs/components.html index 950d1f35c..710e7de77 100644 --- a/docs/components.html +++ b/docs/components.html @@ -467,7 +467,7 @@ <div class="well" style="padding: 8px 0;"> <ul class="nav list"> <li class="nav-header">List header</li> - <li class="active"><a href="#"><i class="icon home"></i> Home</a></li> + <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li> <li><a href="#"><i class="icon book"></i> Library</a></li> <li><a href="#"><i class="icon pencil"></i> Applications</a></li> <li class="nav-header">Another list header</li> @@ -740,6 +740,33 @@ <input type="text" class="search-query pull-left" placeholder="Search"> </form> </pre> + <h3>Optional responsive variation</h3> + <p>Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p> +<pre class="prettyprint linenums"> +<div class="navbar navbar-static"> + <div class="navbar-inner"> + <div class="container"> + + <!-- .btn-navbar is used as the toggle for collapsed navbar content --> + <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> + + <!-- Be sure to leave the brand out there if you want it shown --> + <a class="brand" href="#">Project name</a> + + <!-- Everything you want hidden at 940px or less, place within here --> + <div class="nav-collapse"> + <!-- .nav, .navbar-search, .navbar-form, etc --> + </div> + + </div> + </div> +</div> +</pre> + </div><!-- /.span --> <div class="span4"> <h3>Nav links</h3> diff --git a/docs/download.html b/docs/download.html index 5bcce7ced..832b07ce6 100644 --- a/docs/download.html +++ b/docs/download.html @@ -135,12 +135,8 @@ <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label> <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label> - <!-- <h3>Responsive</h3> - <label class="checkbox"><input type="checkbox" value=""> Max-width 480px</label> - <label class="checkbox"><input type="checkbox" value=""> Max-width 768px</label> - <label class="checkbox"><input type="checkbox" value=""> Max-width 1210px</label> - --> + <label class="checkbox"><input checked="checked" type="checkbox" value="responsive.less"> Responsive layouts</label> </div><!-- /span --> </div><!-- /row --> </section> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 3a92953ae..5c91431fa 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -395,7 +395,7 @@ <div class="well" style="padding: 8px 0;"> <ul class="nav list"> <li class="nav-header">{{_i}}List header{{/i}}</li> - <li class="active"><a href="#"><i class="icon home"></i> {{_i}}Home{{/i}}</a></li> + <li class="active"><a href="#"><i class="icon white home"></i> {{_i}}Home{{/i}}</a></li> <li><a href="#"><i class="icon book"></i> {{_i}}Library{{/i}}</a></li> <li><a href="#"><i class="icon pencil"></i> {{_i}}Applications{{/i}}</a></li> <li class="nav-header">{{_i}}Another list header{{/i}}</li> @@ -668,6 +668,33 @@ <input type="text" class="search-query pull-left" placeholder="{{_i}}Search{{/i}}"> </form> </pre> + <h3>{{_i}}Optional responsive variation{{/i}}</h3> + <p>{{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.{{/i}}</p> +<pre class="prettyprint linenums"> +<div class="navbar navbar-static"> + <div class="navbar-inner"> + <div class="container"> + + <!-- .btn-navbar is used as the toggle for collapsed navbar content --> + <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> + + <!-- Be sure to leave the brand out there if you want it shown --> + <a class="brand" href="#">{{_i}}Project name{{/i}}</a> + + <!-- Everything you want hidden at 940px or less, place within here --> + <div class="nav-collapse"> + <!-- .nav, .navbar-search, .navbar-form, etc --> + </div> + + </div> + </div> +</div> +</pre> + </div><!-- /.span --> <div class="span4"> <h3>{{_i}}Nav links{{/i}}</h3> diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index dccc5fbb6..34f8130ac 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -63,12 +63,8 @@ <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> {{_i}}Close icon{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> {{_i}}Utilities{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> {{_i}}Component animations{{/i}}</label> - <!-- <h3>{{_i}}Responsive{{/i}}</h3> - <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 480px{{/i}}</label> - <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 768px{{/i}}</label> - <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 1210px{{/i}}</label> - --> + <label class="checkbox"><input checked="checked" type="checkbox" value="responsive.less"> {{_i}}Responsive layouts{{/i}}</label> </div><!-- /span --> </div><!-- /row --> </section> |
