rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
This commit is contained in:
Mark Otto 2012-01-17 23:19:21 -08:00
commit 41a410b8e6
5 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
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: Mon Jan 16 16:01:19 PST 2012 * Date: Tue Jan 17 23:17:49 PST 2012
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -2940,27 +2940,24 @@ a.thumbnail:hover {
padding: 0; padding: 0;
} }
.accordion-group { .accordion-group {
margin-bottom: 9px; background-color: #f5f5f5;
background-color: #eee;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
} }
.accordion-heading { .accordion-heading {
display: block; padding: 8px 15px;
padding: 9px 15px; border-bottom: 0;
} }
.accordion-body { .accordion-body {
display: none; margin: 0 0 2px;
padding: 15px; }
margin-left: 0; .accordion-inner {
border-top: 1px solid #ddd; padding: 9px 15px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); border-top: 1px solid #e5e5e5;
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
} }
.accordion .in { .accordion .in {
display: block; margin-bottom: 9px;
} }
.carousel { .carousel {
position: relative; position: relative;

9
bootstrap.min.css vendored
View File

@ -514,10 +514,11 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.progress.info .bar{background-color:#339bb9;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} .progress.info .bar{background-color:#339bb9;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
.progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
.accordion{padding:0;} .accordion{padding:0;}
.accordion-group{margin-bottom:9px;background-color:#eee;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.accordion-heading{display:block;padding:9px 15px;} .accordion-heading{padding:8px 15px;border-bottom:0;}
.accordion-body{display:none;padding:15px;margin-left:0;border-top:1px solid #ddd;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);} .accordion-body{margin:0 0 2px;}
.accordion .in{display:block;} .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
.accordion .in{margin-bottom:9px;}
.carousel{position:relative;line-height:1;} .carousel{position:relative;line-height:1;}
.carousel-inner{overflow:hidden;width:100%;position:relative;} .carousel-inner{overflow:hidden;width:100%;position:relative;}
.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} .carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}

2
docs/base-css.html
View File

@ -623,7 +623,7 @@
<h3>1. Default table styles</h3> <h3>1. Default table styles</h3>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<p>Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.</p> <p>Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;table&gt; &lt;table&gt;
... ...

48
docs/javascript.html
View File

@ -1080,41 +1080,45 @@ $('#my-alert').bind('closed', function () {
<h2>Example accordion</h2> <h2>Example accordion</h2>
<p>Using the collapse plugin, we built a simple accordion style widget:</p> <p>Using the collapse plugin, we built a simple accordion style widget:</p>
<div class="accordion"> <div class="accordion2" id="accordion2">
<div class="accordion-group"> <div class="accordion-group">
<a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"> <div class="accordion-heading">
Collapsible group #1 <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
Collapsible Group Item #1
</a> </a>
<div class="accordion-body collapse in" id="collapseOne"> </div>
<h5>Lorem ipsum</h5> <div id="collapseOne" class="accordion-body collapse in">
<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p> <div class="accordion-inner">
<p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p> Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
<p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p> </div>
</div> </div>
</div> </div>
<div class="accordion-group"> <div class="accordion-group">
<a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"> <div class="accordion-heading">
Collapsible group #2 <a data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
Collapsible Group Item #2
</a> </a>
<div class="accordion-body collapse" id="collapseTwo"> </div>
<h5>Lorem ipsum</h5> <div id="collapseTwo" class="accordion-body collapse">
<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p> <div class="accordion-inner">
<p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p> Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
<p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p> </div>
</div> </div>
</div> </div>
<div class="accordion-group"> <div class="accordion-group">
<a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseThree"> <div class="accordion-heading">
Collapsible group #3 <a data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
Collapsible Group Item #3
</a> </a>
<div class="accordion-body collapse" id="collapseThree"> </div>
<h5>Lorem ipsum</h5> <div id="collapseThree" class="accordion-body collapse">
<p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p> <div class="accordion-inner">
<p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p> Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
<p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p>
</div> </div>
</div> </div>
</div> </div>
</div>
<hr> <hr>
<h2>Using bootstrap-collapse.js</h2> <h2>Using bootstrap-collapse.js</h2>

25
lib/accordion.less
View File

@ -2,24 +2,27 @@
// --------- // ---------
.accordion { .accordion {
padding: 0; margin-bottom: @baseLineHeight;
} }
.accordion-group { .accordion-group {
margin-bottom: @baseLineHeight / 2; background-color: #f5f5f5;
background-color: #eee;
.border-radius(4px); .border-radius(4px);
} }
.accordion-heading { .accordion-heading {
display: block; padding: 8px 15px;
padding: 9px 15px; border-bottom: 0;
} }
.accordion-body { .accordion-body {
display: none; margin: 0 0 2px;
padding: 15px;
margin-left: 0;
border-top: 1px solid #ddd;
.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
} }
.accordion-inner {
padding: 9px 15px;
border-top: 1px solid #e5e5e5;
}
.accordion .in { .accordion .in {
display: block; margin-bottom: @baseLineHeight / 2;
} }