diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
| commit | a9378a92670f4bf5ccb753191af795c45bb64998 (patch) | |
| tree | 9690c9a1c123c3103a1f345015f93aac8b43e983 /less/thumbnails.less | |
| parent | cf09e6a6b5e314f4f7433f21bd32287885c95451 (diff) | |
| parent | f584500211af84038bcff9b363343eb02cda6ccd (diff) | |
| download | bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.tar.xz bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
dist/css/bootstrap.min.css
Diffstat (limited to 'less/thumbnails.less')
| -rw-r--r-- | less/thumbnails.less | 29 |
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 { |