From: Mark Otto Date: Sun, 1 Apr 2012 08:05:00 +0000 (-0700) Subject: fix #2296: allow fluid thumbnails X-Git-Tag: v2.0.3~5^2~56^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=647f1c98eda0f150e54e9193181acb462a3b9357;p=thirdparty%2Fbootstrap.git fix #2296: allow fluid thumbnails --- diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 30547f2ba7..badb33c217 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index adb1402c0e..df663f69f5 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 7d6d80079c..1b09b7904d 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 ecb847b37e..3331cfe5b5 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 7cf76524b0..255a078b35 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -421,7 +421,28 @@ - +

Fluid thumbnails

+
+
+ +
+
diff --git a/less/thumbnails.less b/less/thumbnails.less index 0dfabdf06d..7fa77afa9a 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 {