diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0b6ef3957..98d3d90d17 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3383,35 +3383,7 @@ input[type="button"].btn-block { margin-top: 9px; } -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"] { - margin-right: 2px; -} - -.nav-list .divider { +.nav .divider { height: 1px; margin: 9px 1px; overflow: hidden; diff --git a/docs/components.html b/docs/components.html index 87bef8db28..1395e7a2f0 100644 --- a/docs/components.html +++ b/docs/components.html @@ -740,6 +740,16 @@ </ul> +

Horizontal dividers

+

Add a horizontal divider by creating an empty list item with the class .divider, like so:

+
+<ul class="nav nav-tabs nav-stacked">
+  ...
+  <li class="divider"></li>
+  ...
+</ul>
+
+
@@ -813,53 +823,6 @@ </ul> - -
- - -

Nav lists

-

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.

- -

Example nav list

-

Take a list of links and add class="nav nav-list":

-
-
- -
-
-
-<ul class="nav nav-list">
-  <li class="nav-header">List header</li>
-  <li class="active"><a href="#">Home</a></li>
-  <li><a href="#">Library</a></li>
-  ...
-</ul>
-
-

- Note - For nesting within a nav list, include class="nav nav-list" on any nested <ul>. -

- -

Horizontal dividers

-

Add a horizontal divider by creating an empty list item with the class .divider, like so:

-
-<ul class="nav nav-list">
-  ...
-  <li class="divider"></li>
-  ...
-</ul>
-
- diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index c6a6776d04..3de85a2372 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -671,6 +671,16 @@ </ul> +

{{_i}}Horizontal dividers{{/i}}

+

{{_i}}Add a horizontal divider by creating an empty list item with the class .divider, like so:{{/i}}

+
+<ul class="nav nav-tabs nav-stacked">
+  ...
+  <li class="divider"></li>
+  ...
+</ul>
+
+
@@ -744,53 +754,6 @@ </ul> - -
- - -

{{_i}}Nav lists{{/i}}

-

{{_i}}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}}

- -

{{_i}}Example nav list{{/i}}

-

{{_i}}Take a list of links and add class="nav nav-list":{{/i}}

-
-
- -
-
{{! /example }} -
-<ul class="nav nav-list">
-  <li class="nav-header">{{_i}}List header{{/i}}</li>
-  <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
-  <li><a href="#">{{_i}}Library{{/i}}</a></li>
-  ...
-</ul>
-
-

- {{_i}}Note{{/i}} - {{_i}}For nesting within a nav list, include class="nav nav-list" on any nested <ul>.{{/i}} -

- -

{{_i}}Horizontal dividers{{/i}}

-

{{_i}}Add a horizontal divider by creating an empty list item with the class .divider, like so:{{/i}}

-
-<ul class="nav nav-list">
-  ...
-  <li class="divider"></li>
-  ...
-</ul>
-
- diff --git a/less/navs.less b/less/navs.less index 923f728526..e435e45e88 100644 --- a/less/navs.less +++ b/less/navs.less @@ -42,36 +42,8 @@ margin-top: 9px; } - - -// NAV LIST -// -------- - -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: @white; - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - background-color: @linkColor; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} // Dividers (basically an hr) within the dropdown -.nav-list .divider { +.nav .divider { .nav-divider(); }