From: Mark Otto <markdotto@gmail.com>
Date: Mon, 2 Dec 2013 05:18:41 +0000 (-0800)
Subject: Merge pull request #10662 from kevinlisota/thumbnail-images
X-Git-Tag: v3.0.3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc6951fa15ab990b5d90edd7acc9f1bbf2f16875;p=thirdparty%2Fbootstrap.git

Merge pull request #10662 from kevinlisota/thumbnail-images

add responsive CSS to hyperlinked images when thumbnail caption markup used
---

cc6951fa15ab990b5d90edd7acc9f1bbf2f16875
diff --cc less/thumbnails.less
index 43e7d1d26b,f6064a2450..11aa283a0e
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@@ -5,31 -5,29 +5,32 @@@
  
  // Mixin and adjust the regular image class
  .thumbnail {
 -  .img-thumbnail();
 -  display: block; // Override the inline-block from `.img-thumbnail`
 +  display: block;
 +  padding: @thumbnail-padding;
    margin-bottom: @line-height-computed;
 +  line-height: @line-height-base;
 +  background-color: @thumbnail-bg;
 +  border: 1px solid @thumbnail-border;
 +  border-radius: @thumbnail-border-radius;
 +  .transition(all .2s ease-in-out);
  
-   > img {
+   > img,
+   a > img {
      .img-responsive();
 +    margin-left: auto;
 +    margin-right: auto;
    }
 -}
 -
  
 -// Add a hover state for linked versions only
 -a.thumbnail:hover,
 -a.thumbnail:focus {
 -  border-color: @link-color;
 -}
 +  // Add a hover state for linked versions only
 +  a&:hover,
 +  a&:focus,
 +  a&.active {
 +    border-color: @link-color;
 +  }
  
 -// Images and captions
 -.thumbnail > img {
 -  margin-left: auto;
 -  margin-right: auto;
 -}
 -.thumbnail .caption {
 -  padding: @thumbnail-caption-padding;
 -  color: @thumbnail-caption-color;
 +  // Image captions
 +  .caption {
 +    padding: @thumbnail-caption-padding;
 +    color: @thumbnail-caption-color;
 +  }
  }