diff options
| author | Jacob Thornton <[email protected]> | 2012-01-08 00:50:48 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-08 00:50:48 -0800 |
| commit | bc505560a05cd867ea8dbfbcefe2217223d58316 (patch) | |
| tree | 2a2948c3b8b606cf5707ab7a37199d18b114c435 | |
| parent | 4478df768168fe41599508688046612bf5f1e526 (diff) | |
| parent | 3c2f82f469be4792e85eb73fd1e3b882dcadd48d (diff) | |
| download | bootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.tar.xz bootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.css
| -rw-r--r-- | bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/components.html | 30 | ||||
| -rw-r--r-- | lib/progress-bars.less | 6 |
3 files changed, 33 insertions, 5 deletions
diff --git a/bootstrap.css b/bootstrap.css index 7d6263c6b..a46f6ca85 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: Sat Jan 7 23:50:13 PST 2012 + * Date: Sun Jan 8 00:50:20 PST 2012 */ html, body { margin: 0; diff --git a/docs/components.html b/docs/components.html index 6fca1268f..bd8753401 100644 --- a/docs/components.html +++ b/docs/components.html @@ -346,6 +346,16 @@ <li><a href="#C" data-toggle="tab">Section 3</a></li> </ul> </div> <!-- /tabbable --> +<pre class="prettyprint linenums" style="margin-top: 11px;"> +<div class="tabbable tabs-bottom"> + <ul class="nav tabs"> + ... + </ul> + <div class="tab-content"> + ... + </div> +</div> +</pre> </div> <div class="span4"> <h4>Tabs on the left</h4> @@ -368,6 +378,16 @@ </div> </div> </div> <!-- /tabbable --> +<pre class="prettyprint linenums"> +<div class="tabbable tabs-left"> + <ul class="nav tabs"> + ... + </ul> + <div class="tab-content"> + ... + </div> +</div> +</pre> </div> <div class="span4"> <h4>Tabs on the right</h4> @@ -390,6 +410,16 @@ </div> </div> </div> <!-- /tabbable --> +<pre class="prettyprint linenums"> +<div class="tabbable tabs-right"> + <ul class="nav tabs"> + ... + </ul> + <div class="tab-content"> + ... + </div> +</div> +</pre> </div> </div> diff --git a/lib/progress-bars.less b/lib/progress-bars.less index 28c56d131..f5a839834 100644 --- a/lib/progress-bars.less +++ b/lib/progress-bars.less @@ -39,16 +39,14 @@ height: 18px; margin-bottom: 18px; #gradient > .vertical(#f5f5f5, #f9f9f9); - border: 1px solid #ddd; .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); } // Bar of progress .progress .bar { width: 0%; - height: 20px; - margin: -1px; - #gradient > .vertical(#62c462, #57a957); + height: 18px; + margin: ; #gradient > .vertical(#149bdf, #0480be); .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); .box-sizing(border-box); |