From 12af75eef48a61357a3ab8714fa53b231ebfe40b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 21:49:37 -0700 Subject: [PATCH] updated pills to include vertical (stacked) variation in patterns and documentation --- bootstrap.css | 5 ++++- bootstrap.min.css | 1 + docs/index.html | 8 ++++---- lib/patterns.less | 7 +++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 7eec0a760..a6ef27570 100644 --- 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 index 2961b6eab..f6169a793 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -273,6 +273,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} .pills .active a{color:#ffffff;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;} .tab-content>*,.pill-content>*{display:none;} .tab-content>.active,.pill-content>.active{display:block;} diff --git a/docs/index.html b/docs/index.html index a83b75e62..dd59e877f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1447,7 +1447,7 @@

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.

-

Basic tab example

+

Basic tabs example