Skip to content

Commit

Permalink
Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avo…
Browse files Browse the repository at this point in the history
…id dupe and unnecessary styles
  • Loading branch information
mdo committed Nov 30, 2013
1 parent bf9f392 commit e484828
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 0 additions & 3 deletions dist/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -5198,10 +5198,7 @@ a.list-group-item.active > .badge,
}

.thumbnail {
display: inline-block;
display: block;
height: auto;
max-width: 100%;
padding: 4px;
margin-bottom: 20px;
line-height: 1.428571429;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions less/thumbnails.less
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit e484828

Please sign in to comment.