From: Mark Otto <otto@github.com>
Date: Sat, 30 Mar 2013 23:56:49 +0000 (-0700)
Subject: Remove .nav-list given new .list-group
X-Git-Tag: v3.0.0-rc1~522
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1683669eaa75555e1454105460ed6b7bcaca9f11;p=thirdparty%2Fbootstrap.git

Remove .nav-list given new .list-group
---

diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html
index 652b845cd8..1eccba357a 100644
--- a/docs/_includes/docs-nav.html
+++ b/docs/_includes/docs-nav.html
@@ -107,7 +107,6 @@
       <ul class="nav">
         <li><a href="#nav-tabs">Tabs nav</a></li>
         <li><a href="#nav-pills">Pills nav</a></li>
-        <li><a href="#nav-list">List nav</a></li>
         <li><a href="#nav-justified">Justified nav</a></li>
         <li><a href="#nav-disabled-links">Disabled links</a></li>
         <li><a href="#nav-alignment">Alignment options</a></li>
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fcbc5d5808..8e5a3dbc50 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3267,30 +3267,6 @@ button.close {
   text-align: center;
 }
 
-.nav-list > li > a {
-  margin-bottom: -1px;
-  border: 1px solid #e5e5e5;
-}
-
-.nav-list > li:first-child > a {
-  border-top-right-radius: 4px;
-  border-top-left-radius: 4px;
-}
-
-.nav-list > li:last-child > a {
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  z-index: 2;
-  color: #fff;
-  background-color: #428bca;
-  border-color: #428bca;
-}
-
 .nav > .disabled > a {
   color: #999999;
 }
@@ -4803,7 +4779,7 @@ a.badge:focus {
   top: 0;
 }
 
-.nav-list > .active > a > .badge,
+a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
   color: #428bca;
   background-color: #fff;
diff --git a/docs/docs.html b/docs/docs.html
index 844a467d2b..4c491d6864 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -2509,7 +2509,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
     <h4>Navigation</h4>
     <div class="bs-docs-example">
-      <ul class="nav nav-list">
+      <ul class="nav nav-pills nav-stacked">
         <li class="active"><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
         <li><a href="#"><span class="glyphicon glyphicon-book"></span> Library</a></li>
         <li><a href="#"><span class="glyphicon glyphicon-pencil"></span> Applications</a></li>
@@ -2517,7 +2517,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </ul>
     </div><!-- /bs-docs-example -->
 {% highlight html linenos %}
-<ul class="nav nav-list">
+<ul class="nav nav-pills nav-stacked">
   <li class="active"><a href="#"><span class="glyphicon glyphicon-home"></span> Home</a></li>
   <li><a href="#"><span class="glyphicon glyphicon-book"></span> Library</a></li>
   <li><a href="#"><span class="glyphicon glyphicon-pencil"></span> Applications</a></li>
@@ -3094,23 +3094,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <li><a href="#">Profile</a></li>
   <li><a href="#">Messages</a></li>
 </ul>
-{% endhighlight %}
-
-    <h2 id="nav-list">List</h2>
-    <p>Swap the tabs class for <code>.nav-list</code>.</p>
-    <div class="bs-docs-example">
-      <ul class="nav nav-list" style="max-width: 300px;">
-        <li class="active"><a href="#">Home</a></li>
-        <li><a href="#">Profile</a></li>
-        <li><a href="#">Messages</a></li>
-      </ul>
-    </div>
-{% highlight html linenos %}
-<ul class="nav nav-list">
-  <li class="active"><a href="#">Home</a></li>
-  <li><a href="#">Profile</a></li>
-  <li><a href="#">Messages</a></li>
-</ul>
 {% endhighlight %}
 
     <h2 id="nav-pills">Pills</h2>
@@ -3889,7 +3872,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         <li><a href="#">Messages <span class="badge">3</span></a></li>
       </ul>
       <br>
-      <ul class="nav nav-list" style="max-width: 260px;">
+      <ul class="nav nav-pills nav-stacked" style="max-width: 260px;">
         <li class="active">
           <a href="#">
             <span class="badge pull-right">42</span>
@@ -4510,15 +4493,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <div class="list-group">
         <a href="#" class="list-group-item active">
           <h4 class="list-group-item-heading">List group item heading</h4>
-          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
+          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
         </a>
         <a href="#" class="list-group-item">
           <h4 class="list-group-item-heading">List group item heading</h4>
-          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
+          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
         </a>
         <a href="#" class="list-group-item">
           <h4 class="list-group-item-heading">List group item heading</h4>
-          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
+          <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
         </a>
       </div>
     </div>
diff --git a/less/badges.less b/less/badges.less
index 4f1e71edae..9cbb0f23a0 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -48,7 +48,7 @@ a.badge {
 }
 
 // Account for counters in navs
-.nav-list > .active > a > .badge,
+a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
   color: @link-color;
   background-color: #fff;
diff --git a/less/navs.less b/less/navs.less
index be165e4344..ed41b8cb47 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -117,30 +117,6 @@
   text-align: center;
 }
 
-// Lists
-// -------------------------
-
-.nav-list > li > a {
-  margin-bottom: -1px; // pull up the following link for a 1px border between
-  border: 1px solid #e5e5e5;
-}
-.nav-list > li:first-child > a {
-   border-top-left-radius: @border-radius-base;
-  border-top-right-radius: @border-radius-base;
-}
-.nav-list > li:last-child > a {
-   border-bottom-left-radius: @border-radius-base;
-  border-bottom-right-radius: @border-radius-base;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  z-index: 2; // Bring active item forward so border sits on top of next element
-  color: #fff;
-  background-color: @link-color;
-  border-color: @link-color;
-}
-
 
 
 // Nav states and addons