mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

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
parent 7e56e2265d bca3ff4ed6
commit fca35c0dba
29 changed files with 789 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/tests/css-tests.html
+16 -17
View File
@@ -214,13 +214,13 @@
<div class="row">
<div class="span4">
<img src="http://placehold.it/600x600" height="200">
<img data-src="holder.js/600x600" height="200">
</div>
<div class="span4">
<img src="http://placehold.it/600x600">
<img data-src="holder.js/600x600">
</div>
<div class="span4">
<img src="http://placehold.it/600x600">
<img data-src="holder.js/600x600">
</div>
</div>
@@ -228,13 +228,13 @@
<div class="row">
<div class="span4">
<img src="http://placehold.it/600x900" style="width: 200px;">
<img data-src="holder.js/600x900" style="width: 200px;">
</div>
<div class="span4">
<img src="http://placehold.it/200x300">
<img data-src="holder.js/200x300">
</div>
<div class="span4">
<img src="http://placehold.it/600x600">
<img data-src="holder.js/600x600">
</div>
</div>
@@ -723,16 +723,16 @@
<h4>Default thumbnails (no grid sizing)</h4>
<ul class="thumbnails">
<li class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</li>
<li class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</li>
<li class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</li>
<li class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</li>
</ul>
@@ -741,17 +741,17 @@
<ul class="thumbnails">
<li class="span3 offset3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
<li class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
<li class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
</ul>
@@ -761,23 +761,22 @@
<ul class="thumbnails">
<li class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
<li class="span3 offset3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
<li class="span3">
<a href="#" class="thumbnail">
<img src="http://placehold.it/260x180" alt="">
<img data-src="holder.js/260x180" alt="">
</a>
</li>
</ul>
<!-- Tabs
================================================== -->