From: Chris Rebert <code@rebertia.com>
Date: Fri, 5 Sep 2014 23:04:56 +0000 (-0700)
Subject: Address #14541 by tweaking badge docs
X-Git-Tag: v3.3.0~202^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14546%2Fhead;p=thirdparty%2Fbootstrap.git

Address #14541 by tweaking badge docs

* move unrelated .btn-primary example out of the pills subsection
* remove excessive .nav-stacked example
---

diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html
index 7c67ba769f..98c6154914 100644
--- a/docs/_includes/components/badges.html
+++ b/docs/_includes/components/badges.html
@@ -5,9 +5,17 @@
 
   <div class="bs-example">
     <a href="#">Inbox <span class="badge">42</span></a>
+    <br><br>
+    <button class="btn btn-primary" type="button">
+      Messages <span class="badge">4</span>
+    </button>
   </div>
 {% highlight html %}
 <a href="#">Inbox <span class="badge">42</span></a>
+
+<button class="btn btn-primary" type="button">
+  Messages <span class="badge">4</span>
+</button>
 {% endhighlight %}
 
   <h4>Self collapsing</h4>
@@ -26,36 +34,12 @@
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li>
     </ul>
-    <br>
-    <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;">
-      <li role="presentation" class="active">
-        <a href="#">
-          <span class="badge pull-right">42</span>
-          Home
-        </a>
-      </li>
-      <li role="presentation"><a href="#">Profile</a></li>
-      <li role="presentation">
-        <a href="#">
-          <span class="badge pull-right">3</span>
-          Messages
-        </a>
-      </li>
-    </ul>
-    <br>
-    <button class="btn btn-primary" type="button">
-      Messages <span class="badge">4</span>
-    </button>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills nav-stacked" role="tablist">
-  <li role="presentation" class="active">
-    <a href="#">
-      <span class="badge pull-right">42</span>
-      Home
-    </a>
-  </li>
-  ...
+<ul class="nav nav-pills" role="tablist">
+  <li role="presentation" class="active"><a href="#">Home <span class="badge">42</span></a></li>
+  <li role="presentation"><a href="#">Profile</a></li>
+  <li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li>
 </ul>
 {% endhighlight %}
 </div>