diff options
| author | Mark Otto <[email protected]> | 2012-02-16 21:04:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-16 21:04:16 -0800 |
| commit | 0369c1fcfc22530171fdf6a1d6400767dc13f609 (patch) | |
| tree | 5143a3a1cb708a2fe0f6af736e0238cff4e305a3 | |
| parent | c3d3cf7262ff53215f11ec4772c9c787643b33e2 (diff) | |
| download | bootstrap-0369c1fcfc22530171fdf6a1d6400767dc13f609.tar.xz bootstrap-0369c1fcfc22530171fdf6a1d6400767dc13f609.zip | |
add mention of navbar vertical divider in docs
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53191 -> 53191 bytes | |||
| -rw-r--r-- | docs/components.html | 8 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 8 | ||||
| -rw-r--r-- | docs/upgrading.html | 7 |
4 files changed, 18 insertions, 5 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 0aad46dec..7aee4471a 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index af00ece97..cf11e6998 100644 --- a/docs/components.html +++ b/docs/components.html @@ -880,6 +880,14 @@ <li><a href="#">Link</a></li> </ul> </pre> + <p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:</p> +<pre class="prettyprint linenums"> +<ul class="nav"> + ... + <li class="divider-vertical"></li> + ... +</ul> +</pre> <h3>Component alignment</h3> <p>To align a nav, 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>Adding dropdowns</h3> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 76c78d141..1887b6f77 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -804,6 +804,14 @@ <li><a href="#">{{_i}}Link{{/i}}</a></li> </ul> </pre> + <p>{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}</p> +<pre class="prettyprint linenums"> +<ul class="nav"> + ... + <li class="divider-vertical"></li> + ... +</ul> +</pre> <h3>{{_i}}Component alignment{{/i}}</h3> <p>{{_i}}To align a nav, 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.{{/i}}</p> <h3>{{_i}}Adding dropdowns{{/i}}</h3> diff --git a/docs/upgrading.html b/docs/upgrading.html index 0c9ab1673..f56f22545 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -115,7 +115,7 @@ <ul> <li>Media queries added for <strong>basic support</strong> across mobile and tablet devices <li>Responsive CSS is compiled separately, as bootstrap-responsive.css</li> - </ul> + </ul> </section> @@ -255,13 +255,10 @@ <li>The <code>animate</code> option was renamed to <code>animation</code>.</li> <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li> </ul> - <h3>Tooltips</h3> - <ul> - <li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li> - </ul> <h3>Popovers</h3> <ul> <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li> + <li>The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.</li> </ul> <h3>New plugins</h3> <ul> |