diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3f7c2b967e..30547f2ba7 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 106fed157e..adb1402c0e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -164,9 +164,6 @@ width: auto; margin: 0; } - .thumbnails [class*="span"] { - width: auto; - } input[class*="span"], select[class*="span"], textarea[class*="span"], @@ -597,9 +594,6 @@ .thumbnails { margin-left: -30px; } - .thumbnails > li { - margin-left: 30px; - } } @media (max-width: 979px) { body { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7f47a21249..7d6d80079c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3627,8 +3627,7 @@ input[type="submit"].btn.btn-mini { clear: both; } .thumbnails > li { - float: left; - margin: 0 0 18px 20px; + margin-bottom: 18px; } .thumbnail { display: block; diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less index 9e77a113d7..ecb847b37e 100644 --- a/less/responsive-1200px-min.less +++ b/less/responsive-1200px-min.less @@ -16,8 +16,5 @@ .thumbnails { margin-left: -30px; } - .thumbnails > li { - margin-left: 30px; - } } diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index b2202b5b77..4b8b41fbe2 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -124,12 +124,6 @@ margin: 0; } - // THUMBNAILS - // ---------- - .thumbnails [class*="span"] { - width: auto; - } - // FORM FIELDS // ----------- // Make span* classes full width diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index f6f4b2351c..7cf76524b0 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -329,9 +329,9 @@ -
+ @@ -339,7 +339,6 @@

Dropdowns

-

Dropdown link with hash URL

+
+ + + + + + +

Offset thumbnails

+ + + + diff --git a/less/thumbnails.less b/less/thumbnails.less index 3a12d4e509..0dfabdf06d 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -1,15 +1,19 @@ // THUMBNAILS // ---------- +// Make wrapper ul behave like the grid .thumbnails { margin-left: -@gridGutterWidth; list-style: none; .clearfix(); } + +// Float li to make thumbnails appear in a row .thumbnails > li { - float: left; - margin: 0 0 @baseLineHeight @gridGutterWidth; + margin-bottom: @baseLineHeight; } + +// The actual thumbnail (can be `a` or `div`) .thumbnail { display: block; padding: 4px; @@ -23,6 +27,7 @@ a.thumbnail:hover { border-color: @linkColor; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } + // Images and captions .thumbnail > img { display: block;