rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.2.2-wip' into exploratory

Browse source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
This commit is contained in:
Mark Otto 2012-11-30 00:13:30 -08:00
commit fca35c0dba
29 changed files with 789 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

43
docs/components.html
View file

@ -1721,22 +1721,22 @@
<div class="row">
<div class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</div>
<div class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</div>
<div class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</div>
<div class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</div>
</div>
@ -1745,7 +1745,7 @@
&lt;div class="row"&gt;
&lt;div class="span3"&gt;
&lt;a href="#" class="thumbnail"&gt;
&lt;img src="http://placehold.it/260x180" alt=""&gt;
&lt;img src="holder.js/260x180" alt=""&gt;
&lt;/a&gt;
&lt;/div&gt;
...
@ -1758,7 +1758,7 @@
<div class="row">
<div class="span4">
<div class="thumbnail">
<img src="http://placehold.it/300x200" alt="">
<img data-src="holder.js/300x200" alt="">
<div class="caption">
<h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
@ -1768,7 +1768,7 @@
</div>
<div class="span4">
<div class="thumbnail">
<img src="http://placehold.it/300x200" alt="">
<img data-src="holder.js/300x200" alt="">
<div class="caption">
<h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
@ -1778,7 +1778,7 @@
</div>
<div class="span4">
<div class="thumbnail">
<img src="http://placehold.it/300x200" alt="">
<img data-src="holder.js/300x200" alt="">
<div class="caption">
<h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
@ -1792,7 +1792,7 @@
&lt;div class="row"&gt;
&lt;div class="span4"&gt;
&lt;div class="thumbnail"&gt;
&lt;img src="http://placehold.it/300x200" alt=""&gt;
&lt;img data-src="holder.js/300x200" alt=""&gt;
&lt;h3&gt;Thumbnail label&lt;/h3&gt;
&lt;p&gt;Thumbnail caption...&lt;/p&gt;
&lt;/div&gt;
@ -2068,7 +2068,7 @@
<div class="bs-docs-example">
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
@ -2077,14 +2077,14 @@
</div>
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
@ -2097,7 +2097,7 @@
<pre class="prettyprint linenums">
&lt;div class="media"&gt;
&lt;a class="pull-left" href="#"&gt;
&lt;img class="media-object" src="http://placehold.it/64x64"&gt;
&lt;img class="media-object" data-src="holder.js/64x64"&gt;
&lt;/a&gt;
&lt;div class="media-body"&gt;
&lt;h4 class="media-heading"&gt;Media heading&lt;/h4&gt;
@ -2121,7 +2121,7 @@
<ul class="media-list">
<li class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
@ -2129,7 +2129,7 @@
<!-- Nested media object -->
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Nested media heading</h4>
@ -2137,7 +2137,7 @@
<!-- Nested media object -->
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Nested media heading</h4>
@ -2149,7 +2149,7 @@
<!-- Nested media object -->
<div class="media">
<a class="pull-left" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Nested media heading</h4>
@ -2160,7 +2160,7 @@
</li>
<li class="media">
<a class="pull-right" href="#">
<img class="media-object" src="http://placehold.it/64x64">
<img class="media-object" data-src="holder.js/64x64">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
@ -2173,7 +2173,7 @@
&lt;ul class="media-list"&gt;
&lt;li class="media"&gt;
&lt;a class="pull-left" href="#"&gt;
&lt;img class="media-object" src="http://placehold.it/64x64"&gt;
&lt;img class="media-object" data-src="holder.js/64x64"&gt;
&lt;/a&gt;
&lt;div class="media-body"&gt;
&lt;h4 class="media-heading"&gt;Media heading&lt;/h4&gt;
@ -2335,7 +2335,6 @@ class="clearfix"
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="assets/js/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script>
<script src="assets/js/bootstrap-modal.js"></script>
@ -2349,6 +2348,10 @@ class="clearfix"
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/bootstrap-affix.js"></script>
<script src="assets/js/holder/holder.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/application.js"></script>