diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/docs-nav.html | 3 | ||||
| -rw-r--r-- | docs/docs.html | 43 |
2 files changed, 37 insertions, 9 deletions
diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index ebeb0d828..2c001a3f4 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -122,8 +122,9 @@ <li><a href="#navbar-nav">Nav links</a></li> <li><a href="#navbar-forms">Forms in navbars</a></li> <li><a href="#navbar-buttons">Buttons in navbars</a></li> - <li><a href="#navbar-component-alignment">Component alignment</a></li> <li><a href="#navbar-text">Text in navbars</a></li> + <li><a href="#navbar-links">Links in navbars</a></li> + <li><a href="#navbar-component-alignment">Component alignment</a></li> <li><a href="#navbar-fixed-top">Fixed top navbar</a></li> <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li> <li><a href="#navbar-static-top">Static top navbar</a></li> diff --git a/docs/docs.html b/docs/docs.html index e4f711381..3b092f804 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -3488,9 +3488,9 @@ For example, <code><section></code> should be wrapped as inline. <form class="navbar-form pull-left"> <select name="" id="" style="width: 200px;"> <option value="1">1</option> - <option value="1">1</option> - <option value="1">1</option> - <option value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> </select> <button type="submit" class="btn">Submit</button> </form> @@ -3508,7 +3508,7 @@ For example, <code><section></code> should be wrapped as inline. <form class="navbar-form pull-left"> <input type="text" style="width: 200px;"> <label class="checkbox-inline"> - <input type="checkbox"> Derp + <input type="checkbox"> Remember me </label> <button type="submit" class="btn">Submit</button> </form> @@ -3526,16 +3526,43 @@ For example, <code><section></code> should be wrapped as inline. <p>For buttons not residing in a <code><form></code>, add this class to vertically center buttons within a navbar.</p> <div class="bs-docs-example"> <div class="navbar"> - <a href="#" class="navbar-brand">Derp</a> + <a href="#" class="navbar-brand">Brand</a> <button type="button" class="btn">Submit</button> </div> </div> - <h3 id="navbar-component-alignment">Component alignment</h3> - <p>Align nav links, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p> - <h3 id="navbar-text">Text</h3> <p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code><p></code> tag for proper leading and color.</p> + <div class="bs-docs-example"> + <div class="navbar"> + <a href="#" class="navbar-brand">Brand</a> + <p class="navbar-text">Signed in as Mark Otto</p> + </div> + </div> +{% highlight html linenos %} +<div class="navbar"> + <a href="#" class="navbar-brand">Brand</a> + <p class="navbar-text">Signed in as Mark Otto</p> +</div> +{% endhighlight %} + + <h3 id="navbar-links">Links</h3> + <p>For folks using standard links that are not within the regular navbar navigation component, use the <code>.navbar-link</code> class to add the proper colors for the default and inverse navbar options.</p> + <div class="bs-docs-example"> + <div class="navbar"> + <a href="#" class="navbar-brand">Brand</a> + <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> + </div> + </div> +{% highlight html linenos %} +<div class="navbar"> + <a href="#" class="navbar-brand">Brand</a> + <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> +</div> +{% endhighlight %} + + <h3 id="navbar-component-alignment">Component alignment</h3> + <p>Align nav links, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p> <h2>Optional display variations</h2> |