aboutsummaryrefslogtreecommitdiff
path: root/less/thumbnails.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 17:31:58 -0700
committerMark Otto <[email protected]>2013-08-17 17:31:58 -0700
commitba20e512ce53e7cc771ba06d492a01d48db6cc97 (patch)
tree30cebcbb796725c7dc06c9125714d83adbf585c3 /less/thumbnails.less
parent2af9cf10ce2e93fe0ac07651d405abc484e4c608 (diff)
parente29c23afab2577e05cfaa41f64a20f1ca87222fc (diff)
downloadbootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.tar.xz
bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.zip
Merge branch '3.0.0-wip' into bs3_theme
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'less/thumbnails.less')
-rw-r--r--less/thumbnails.less10
1 files changed, 6 insertions, 4 deletions
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 1f896708d..76f79b9e5 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -10,7 +10,7 @@
// Can be `a`, `div`, or `img`
.thumbnail,
.img-thumbnail {
- padding: 4px;
+ padding: @thumbnail-padding;
line-height: @line-height-base;
background-color: @thumbnail-bg;
border: 1px solid @thumbnail-border;
@@ -20,10 +20,12 @@
.thumbnail {
display: block;
}
-.thumbnail > img,
-.img-thumbnail {
+.thumbnail > img {
.img-responsive();
}
+.img-thumbnail {
+ .img-responsive(inline-block);
+}
// Add a hover state for linked versions only
a.thumbnail:hover,
@@ -37,6 +39,6 @@ a.thumbnail:focus {
margin-right: auto;
}
.thumbnail .caption {
- padding: 9px;
+ padding: @thumbnail-caption-padding;
color: @thumbnail-caption-color;
}