updated pills to include vertical (stacked) variation in patterns and documentation

mdo · mdo · commit 12af75eef48a · 2011-10-11T21:49:37.000-07:00
diff --git a/bootstrap.css b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Oct 10 19:37:09 PDT 2011
+ * Date: Tue Oct 11 21:49:21 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1706,6 +1706,9 @@ a.menu:after, .dropdown-toggle:after {
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
   background-color: #0069d6;
 }
+.pills-vertical > li {
+  float: none;
+}
 .tab-content, .pill-content {
   clear: both;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/docs/index.html b/docs/index.html
@@ -1447,7 +1447,7 @@ <h2>Tabs and pills</h2>
       <p>Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.</p>
     </div>
     <div class="span12">
-      <h3>Basic tab example</h3>
+      <h3>Basic tabs example</h3>
       <ul class="tabs">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
@@ -1473,7 +1473,7 @@ <h3>Basic tab example</h3>
   &lt;li&gt;&lt;a href="#"&gt;Contact&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <h3>Alternate styles</h3>
+      <h3>Alternate tabs</h3>
       <p>You can also use tabs that are stacked on either side of an element, or on the bottom.</p>
       <ul class="tabs tabs-left">
         <li class="active"><a href="#">Active link</a></li>
@@ -1512,9 +1512,9 @@ <h3>Basic pills example</h3>
   &lt;li&gt;&lt;a href="#"&gt;Contact&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <h3>Alternate styles</h3>
+      <h3>Vertical pill nav</h3>
       <p>With a pill-style nav, you can also stack the list items to have a simple sidebar. We don't offer left or right aligned versions here because that's easy enough to customize based on your own needs</p>
-      <ul class="pills pills-vertical">
+      <ul class="pills pills-vertical span4">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
diff --git a/lib/patterns.less b/lib/patterns.less
@@ -412,6 +412,13 @@ a.menu:after,
     background-color: @linkColor;
   }
 }
+// Stacked pills
+.pills-vertical {
+  > li {
+    float: none;
+  }
+}
+
 
 // For js-enabled tabbed areas
 .tab-content,

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* http://www.apache.org/licenses/LICENSE-2.0`
`7`	`7`	`*`
`8`	`8`	`* Designed and built with all the love in the world @twitter by @mdo and @fat.`
`9`		`- * Date: Mon Oct 10 19:37:09 PDT 2011`
	`9`	`+ * Date: Tue Oct 11 21:49:21 PDT 2011`
`10`	`10`	`*/`
`11`	`11`	`/* Reset.less`
`12`	`12`	`* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).`
`@@ -1706,6 +1706,9 @@ a.menu:after, .dropdown-toggle:after {`
`1706`	`1706`	`text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);`
`1707`	`1707`	`background-color: #0069d6;`
`1708`	`1708`	`}`
	`1709`	`+.pills-vertical > li {`
	`1710`	`+ float: none;`
	`1711`	`+}`
`1709`	`1712`	`.tab-content, .pill-content {`
`1710`	`1713`	`clear: both;`
`1711`	`1714`	`}`
Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,13 @@ a.menu:after,`
`412`	`412`	`background-color: @linkColor;`
`413`	`413`	`}`
`414`	`414`	`}`
	`415`	`+// Stacked pills`
	`416`	`+.pills-vertical {`
	`417`	`+ > li {`
	`418`	`+ float: none;`
	`419`	`+ }`
	`420`	`+}`
	`421`	`+`
`415`	`422`
`416`	`423`	`// For js-enabled tabbed areas`
`417`	`424`	`.tab-content,`