aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-19 15:25:35 -0700
committerMark Otto <[email protected]>2012-06-19 15:25:35 -0700
commit40298ddbf1c26e2c9b7f67a39eeb35734417cc7e (patch)
tree2994406b8ffc56dcda9832b92be4adffb41ef798
parentff92344f0d6cca2e00a73b9edf204c4231130d07 (diff)
downloadbootstrap-40298ddbf1c26e2c9b7f67a39eeb35734417cc7e.tar.xz
bootstrap-40298ddbf1c26e2c9b7f67a39eeb35734417cc7e.zip
add note to components about nav list nesting
-rw-r--r--docs/components.html16
-rw-r--r--docs/templates/pages/components.mustache16
2 files changed, 14 insertions, 18 deletions
diff --git a/docs/components.html b/docs/components.html
index d70218163..825e9fdac 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -833,18 +833,16 @@
</div>
<pre class="prettyprint linenums">
&lt;ul class="nav nav-list"&gt;
- &lt;li class="nav-header"&gt;
- List header
- &lt;/li&gt;
- &lt;li class="active"&gt;
- &lt;a href="#"&gt;Home&lt;/a&gt;
- &lt;/li&gt;
- &lt;li&gt;
- &lt;a href="#"&gt;Library&lt;/a&gt;
- &lt;/li&gt;
+ &lt;li class="nav-header"&gt;List header&lt;/li&gt;
+ &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#"&gt;Library&lt;/a&gt;&lt;/li&gt;
...
&lt;/ul&gt;
</pre>
+ <p>
+ <span class="label label-info">Note</span>
+ For nesting within a nav list, include <code>class="nav nav-list"</code> on any nested <code>&lt;ul&gt;</code>.
+ </p>
<h3>Horizontal dividers</h3>
<p>Add a horizontal divider by creating an empty list item with the class <code>.divider</code>, like so:</p>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index f84a686ca..1e6d6fe41 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -756,18 +756,16 @@
</div>{{! /example }}
<pre class="prettyprint linenums">
&lt;ul class="nav nav-list"&gt;
- &lt;li class="nav-header"&gt;
- {{_i}}List header{{/i}}
- &lt;/li&gt;
- &lt;li class="active"&gt;
- &lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;
- &lt;/li&gt;
- &lt;li&gt;
- &lt;a href="#"&gt;{{_i}}Library{{/i}}&lt;/a&gt;
- &lt;/li&gt;
+ &lt;li class="nav-header"&gt;{{_i}}List header{{/i}}&lt;/li&gt;
+ &lt;li class="active"&gt;&lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#"&gt;{{_i}}Library{{/i}}&lt;/a&gt;&lt;/li&gt;
...
&lt;/ul&gt;
</pre>
+ <p>
+ <span class="label label-info">{{_i}}Note{{/i}}</span>
+ {{_i}}For nesting within a nav list, include <code>class="nav nav-list"</code> on any nested <code>&lt;ul&gt;</code>.{{/i}}
+ </p>
<h3>{{_i}}Horizontal dividers{{/i}}</h3>
<p>{{_i}}Add a horizontal divider by creating an empty list item with the class <code>.divider</code>, like so:{{/i}}</p>