mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 11:21:23 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Jacob Thornton
2012-01-08 00:50:48 -08:00
parent 4478df7681 3c2f82f469
commit bc505560a0
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.css vendored
View File

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;

30
docs/components.html
View File

@@ -346,6 +346,16 @@
<li><a href="#C" data-toggle="tab">Section 3</a></li> <li><a href="#C" data-toggle="tab">Section 3</a></li>
</ul> </ul>
</div> <!-- /tabbable --> </div> <!-- /tabbable -->
<pre class="prettyprint linenums" style="margin-top: 11px;">
&lt;div class="tabbable tabs-bottom"&gt;
&lt;ul class="nav tabs"&gt;
...
&lt;/ul&gt;
&lt;div class="tab-content"&gt;
...
&lt;/div&gt;
&lt;/div&gt;
</pre>
</div> </div>
<div class="span4"> <div class="span4">
<h4>Tabs on the left</h4> <h4>Tabs on the left</h4>
@@ -368,6 +378,16 @@
</div> </div>
</div> </div>
</div> <!-- /tabbable --> </div> <!-- /tabbable -->
<pre class="prettyprint linenums">
&lt;div class="tabbable tabs-left"&gt;
&lt;ul class="nav tabs"&gt;
...
&lt;/ul&gt;
&lt;div class="tab-content"&gt;
...
&lt;/div&gt;
&lt;/div&gt;
</pre>
</div> </div>
<div class="span4"> <div class="span4">
<h4>Tabs on the right</h4> <h4>Tabs on the right</h4>
@@ -390,6 +410,16 @@
</div> </div>
</div> </div>
</div> <!-- /tabbable --> </div> <!-- /tabbable -->
<pre class="prettyprint linenums">
&lt;div class="tabbable tabs-right"&gt;
&lt;ul class="nav tabs"&gt;
...
&lt;/ul&gt;
&lt;div class="tab-content"&gt;
...
&lt;/div&gt;
&lt;/div&gt;
</pre>
</div> </div>
</div> </div>

6
lib/progress-bars.less
View File

@@ -39,16 +39,14 @@
height: 18px; height: 18px;
margin-bottom: 18px; margin-bottom: 18px;
#gradient > .vertical(#f5f5f5, #f9f9f9); #gradient > .vertical(#f5f5f5, #f9f9f9);
border: 1px solid #ddd;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
} }
// Bar of progress // Bar of progress
.progress .bar { .progress .bar {
width: 0%; width: 0%;
height: 20px; height: 18px;
margin: -1px; margin: ;
#gradient > .vertical(#62c462, #57a957);
#gradient > .vertical(#149bdf, #0480be); #gradient > .vertical(#149bdf, #0480be);
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
.box-sizing(border-box); .box-sizing(border-box);