diff options
| author | Mark Otto <[email protected]> | 2012-02-18 15:23:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-18 15:23:38 -0800 |
| commit | 29e6ef7c703c5a8eb6e19dea22f797c20e1e533e (patch) | |
| tree | 55e216ba49a81f6f5485d0a5a1fe1a62b0b11330 /docs | |
| parent | db940b3d8f48d1f664137c5adb427a35580f80c4 (diff) | |
| download | bootstrap-29e6ef7c703c5a8eb6e19dea22f797c20e1e533e.tar.xz bootstrap-29e6ef7c703c5a8eb6e19dea22f797c20e1e533e.zip | |
clarify forms in navbar per #2072
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53351 -> 53351 bytes | |||
| -rw-r--r-- | docs/components.html | 10 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 79dd29aee..04d93735d 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index 41f5e5819..b7e60df87 100644 --- a/docs/components.html +++ b/docs/components.html @@ -830,8 +830,14 @@ Project name </a> </pre> - <h3>Search form</h3> - <p>Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.</p> + <h3>Forms in navbar</h3> + <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p> +<pre class="prettyprint linenums"> +<form class="navbar-form pull-left"> + <input type="text" class="span2"> +</form> +</pre> + <p>For a more customized search form, add the <code>.navbar-search</code> class to receive specialized styles in the navbar.</p> <pre class="prettyprint linenums"> <form class="navbar-search pull-left"> <input type="text" class="search-query" placeholder="Search"> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index a3df92487..39c9020d2 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -754,8 +754,14 @@ {{_i}}Project name{{/i}} </a> </pre> - <h3>{{_i}}Search form{{/i}}</h3> - <p>{{_i}}Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.{{/i}}</p> + <h3>{{_i}}Forms in navbar{{/i}}</h3> + <p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p> +<pre class="prettyprint linenums"> +<form class="navbar-form pull-left"> + <input type="text" class="span2"> +</form> +</pre> + <p>{{_i}}For a more customized search form, add the <code>.navbar-search</code> class to receive specialized styles in the navbar.{{/i}}</p> <pre class="prettyprint linenums"> <form class="navbar-search pull-left"> <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}"> |