aboutsummaryrefslogtreecommitdiff
path: root/less/thumbnails.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-08-18 19:40:56 -0700
committerJacob Thornton <[email protected]>2013-08-18 19:40:56 -0700
commit93887f4bd001005e75ef636ef7600c6bcc9a61f4 (patch)
treeecf345d0ea97026c059a8b6f9df797a64af83d0c /less/thumbnails.less
parentea383804ecb4527d49c8603a09a37b983faf72d5 (diff)
parentd5cd040f57b5b1036a7a927332a3220cceefae43 (diff)
downloadbootstrap-93887f4bd001005e75ef636ef7600c6bcc9a61f4.tar.xz
bootstrap-93887f4bd001005e75ef636ef7600c6bcc9a61f4.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'less/thumbnails.less')
-rw-r--r--less/thumbnails.less29
1 files changed, 8 insertions, 21 deletions
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 76f79b9e5..1adee9e35 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -3,30 +3,17 @@
// --------------------------------------------------
-// Base classes
-// For thumbnail block-level composite components and simple image styles
-
-// The actual thumbnailed element
-// Can be `a`, `div`, or `img`
-.thumbnail,
-.img-thumbnail {
- padding: @thumbnail-padding;
- 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);
-}
+// Mixin and adjust the regular image class
.thumbnail {
- display: block;
-}
-.thumbnail > img {
- .img-responsive();
-}
-.img-thumbnail {
- .img-responsive(inline-block);
+ .img-thumbnail();
+ display: block; // Override the inline-block from `.img-thumbnail`
+
+ > img {
+ .img-responsive();
+ }
}
+
// Add a hover state for linked versions only
a.thumbnail:hover,
a.thumbnail:focus {