diff options
| author | Mark Otto <[email protected]> | 2012-04-01 01:05:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-01 01:05:00 -0700 |
| commit | 647f1c98eda0f150e54e9193181acb462a3b9357 (patch) | |
| tree | 20b98f906f26716563f4f978e1e07f354a164bad | |
| parent | fe05f9aeb259733de4598014db9df9193cc01ea2 (diff) | |
| download | bootstrap-647f1c98eda0f150e54e9193181acb462a3b9357.tar.xz bootstrap-647f1c98eda0f150e54e9193181acb462a3b9357.zip | |
fix #2296: allow fluid thumbnails
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56961 -> 56985 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 3 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | less/responsive-1200px-min.less | 3 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 23 | ||||
| -rw-r--r-- | less/thumbnails.less | 4 |
6 files changed, 35 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 30547f2ba..badb33c21 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index adb1402c0..df663f69f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -594,6 +594,9 @@ .thumbnails { margin-left: -30px; } + .row-fluid .thumbnails { + margin-left: 0; + } } @media (max-width: 979px) { body { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d6d80079..1b09b7904 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3626,6 +3626,9 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { clear: both; } +.row-fluid .thumbnails { + margin-left: 0; +} .thumbnails > li { margin-bottom: 18px; } diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less index ecb847b37..3331cfe5b 100644 --- a/less/responsive-1200px-min.less +++ b/less/responsive-1200px-min.less @@ -16,5 +16,8 @@ .thumbnails { margin-left: -30px; } + .row-fluid .thumbnails { + margin-left: 0; + } } diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 7cf76524b..255a078b3 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -421,7 +421,28 @@ </li> </ul> - +<h4>Fluid thumbnails</h4> +<div class="row-fluid"> + <div class="span8"> + <ul class="thumbnails"> + <li class="span4"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/260x180" alt=""> + </a> + </li> + <li class="span4"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/260x180" alt=""> + </a> + </li> + <li class="span4"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/260x180" alt=""> + </a> + </li> + </ul> + </div> +</div> diff --git a/less/thumbnails.less b/less/thumbnails.less index 0dfabdf06..7fa77afa9 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -7,6 +7,10 @@ list-style: none; .clearfix(); } +// Fluid rows have no left margin +.row-fluid .thumbnails { + margin-left: 0; +} // Float li to make thumbnails appear in a row .thumbnails > li { |
