aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-20 12:38:49 -0800
committerMark Otto <[email protected]>2012-02-20 12:38:49 -0800
commit7ef7547a1421825cb73382ad6317aba8affe3dc8 (patch)
treee01c87d4f039b6fc506df23b0a59616256945a43 /docs
parent6df925bc756ab6f9e7a26d4b9c5afc858b34b2d2 (diff)
downloadbootstrap-7ef7547a1421825cb73382ad6317aba8affe3dc8.tar.xz
bootstrap-7ef7547a1421825cb73382ad6317aba8affe3dc8.zip
add horizontal divider support to nav list, including documentation for it, per #2106
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin53399 -> 53412 bytes
-rw-r--r--docs/assets/css/bootstrap.css11
-rw-r--r--docs/components.html12
-rw-r--r--docs/templates/pages/components.mustache12
4 files changed, 34 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 146023c5d..58ef3d5ee 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 155f5dad1..472a3fa31 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1612,7 +1612,7 @@ table .span12 {
}
.dropdown-menu .divider {
height: 1px;
- margin: 5px 1px;
+ margin: 8px 1px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
@@ -2217,6 +2217,15 @@ button.btn.small, input[type="submit"].btn.small {
.nav-list [class^="icon-"] {
margin-right: 2px;
}
+.nav-list .divider {
+ height: 1px;
+ margin: 8px 1px;
+ overflow: hidden;
+ background-color: #e5e5e5;
+ border-bottom: 1px solid #ffffff;
+ *width: 100%;
+ *margin: -5px 0 5px;
+}
.nav-tabs, .nav-pills {
*zoom: 1;
}
diff --git a/docs/components.html b/docs/components.html
index 895d62f75..046bd7280 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -542,8 +542,18 @@
<h3>Application-style navigation</h3>
<p>Nav lists provide a simple and easy way to build groups of nav links with optional headers. They're best used in sidebars like the Finder in OS X.</p>
<p>Structurally, they're built on the same core nav styles as tabs and pills, so usage and customization are straightforward.</p>
+ <hr>
<h4>With icons</h4>
<p>Nav lists are also easy to equip with icons. Add the proper <code>&lt;i&gt;</code> tag with class and you're set.</p>
+ <h4>Horizontal dividers</h4>
+ <p>Add a horizontal divider by creating an empty list item with the class <code>.divider</code>, like so:</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav nav-list"&gt;
+ ...
+ &lt;li class="divider"&gt;&lt;/li&gt;
+ ...
+&lt;/ul&gt;
+</pre>
</div>
<div class="span4">
<h3>Example nav list</h3>
@@ -557,6 +567,7 @@
<li class="nav-header">Another list header</li>
<li><a href="#">Profile</a></li>
<li><a href="#">Settings</a></li>
+ <li class="divider"></li>
<li><a href="#">Help</a></li>
</ul>
</div> <!-- /well -->
@@ -587,6 +598,7 @@
<li class="nav-header">Another list header</li>
<li><a href="#"><i class="icon-user"></i> Profile</a></li>
<li><a href="#"><i class="icon-cog"></i> Settings</a></li>
+ <li class="divider"></li>
<li><a href="#"><i class="icon-flag"></i> Help</a></li>
</ul>
</div> <!-- /well -->
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index dcf5212a8..a8aaeeff5 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -466,8 +466,18 @@
<h3>{{_i}}Application-style navigation{{/i}}</h3>
<p>{{_i}}Nav lists provide a simple and easy way to build groups of nav links with optional headers. They're best used in sidebars like the Finder in OS X.{{/i}}</p>
<p>{{_i}}Structurally, they're built on the same core nav styles as tabs and pills, so usage and customization are straightforward.{{/i}}</p>
+ <hr>
<h4>{{_i}}With icons{{/i}}</h4>
<p>{{_i}}Nav lists are also easy to equip with icons. Add the proper <code>&lt;i&gt;</code> tag with class and you're set.{{/i}}</p>
+ <h4>{{_i}}Horizontal dividers{{/i}}</h4>
+ <p>{{_i}}Add a horizontal divider by creating an empty list item with the class <code>.divider</code>, like so:{{/i}}</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav nav-list"&gt;
+ ...
+ &lt;li class="divider"&gt;&lt;/li&gt;
+ ...
+&lt;/ul&gt;
+</pre>
</div>
<div class="span4">
<h3>{{_i}}Example nav list{{/i}}</h3>
@@ -481,6 +491,7 @@
<li class="nav-header">{{_i}}Another list header{{/i}}</li>
<li><a href="#">{{_i}}Profile{{/i}}</a></li>
<li><a href="#">{{_i}}Settings{{/i}}</a></li>
+ <li class="divider"></li>
<li><a href="#">{{_i}}Help{{/i}}</a></li>
</ul>
</div> <!-- /well -->
@@ -511,6 +522,7 @@
<li class="nav-header">{{_i}}Another list header{{/i}}</li>
<li><a href="#"><i class="icon-user"></i> {{_i}}Profile{{/i}}</a></li>
<li><a href="#"><i class="icon-cog"></i> {{_i}}Settings{{/i}}</a></li>
+ <li class="divider"></li>
<li><a href="#"><i class="icon-flag"></i> {{_i}}Help{{/i}}</a></li>
</ul>
</div> <!-- /well -->