Merge pull request #11282 from ZDroid/combination

Combine multiple .thumbnail > img styles

Merge pull request #11282 from ZDroid/combination
Combine multiple .thumbnail > img styles
697a37e7 · Mark Otto · 77bf572c · 688ca328 · 697a37e7 · 697a37e7
Commit 697a37e7 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 11 deletions
+6 -11
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -5241,6 +5241,8 @@ a.list-group-item.active > .badge,
  display: block;
  height: auto;
  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
 }
 a.thumbnail:hover,
@@ -5249,11 +5251,6 @@ a.thumbnail.active {
  border-color: #428bca;
 }
-.thumbnail > img {
-  margin-right: auto;
-  margin-left: auto;
-}
 .thumbnail .caption {
  padding: 9px;
  color: #333333;

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -11,6 +11,8 @@
  > img {
    .img-responsive();
+    margin-left: auto;
+    margin-right: auto;
  }
 }
@@ -22,11 +24,7 @@ a.thumbnail.active {
  border-color: @link-color;
 }
-// Images and captions
+// Image captions
-.thumbnail > img {
-  margin-left: auto;
-  margin-right: auto;
-}
 .thumbnail .caption {
  padding: @thumbnail-caption-padding;
  color: @thumbnail-caption-color;