diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
| commit | 46c3d27468accdf98dd49257f17bdc507890a1c6 (patch) | |
| tree | 9067b23767a152c8cb58f2a2d24bf1276e407e5b /less/thumbnails.less | |
| parent | aad447e29075b52a46931be17a9be4016cc89ef1 (diff) | |
| parent | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (diff) | |
| download | bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.tar.xz bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.zip | |
Merge branch 'master' into pr/11435
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to 'less/thumbnails.less')
| -rw-r--r-- | less/thumbnails.less | 12 |
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; |