aboutsummaryrefslogtreecommitdiff
path: root/less/thumbnails.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-11 22:39:03 -0800
committerMark Otto <[email protected]>2013-12-11 22:39:03 -0800
commit4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch)
treea9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /less/thumbnails.less
parent0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff)
parent9966d035cd35c510369286cbb645340bdd6ffc95 (diff)
downloadbootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz
bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip
Merge branch 'master' into docs_derp
Conflicts: docs-assets/css/docs.css docs-assets/js/application.js
Diffstat (limited to 'less/thumbnails.less')
-rw-r--r--less/thumbnails.less12
1 files changed, 9 insertions, 3 deletions
diff --git a/less/thumbnails.less b/less/thumbnails.less
index bc4178bbf..11aa283a0 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -5,11 +5,17 @@
// 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;