diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
| commit | bb4a39d51cd644b212323a7e36f0b5af2682d0ca (patch) | |
| tree | 60ae6687f516cea501f32f5623a5c0aacb950772 /less/thumbnails.less | |
| parent | 96109d3138fd6f5b67fb1108754e81c077630b36 (diff) | |
| parent | e6eb798178529cf58fab3f33446c0170bae7bdea (diff) | |
| download | bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.tar.xz bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.zip | |
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/thumbnails.less')
| -rw-r--r-- | less/thumbnails.less | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/less/thumbnails.less b/less/thumbnails.less index bc4178bbf..43e7d1d26 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -5,9 +5,14 @@ // 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-responsive(); |