Skip to content

B
bootstrap
Commit 697a37e7 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #11282 from ZDroid/combination 

Combine multiple .thumbnail > img styles
parents 77bf572c 688ca328
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
dist/css/bootstrap.css
View file @ 697a37e7
...@@ -5241,6 +5241,8 @@ a.list-group-item.active > .badge, ...@@ -5241,6 +5241,8 @@ a.list-group-item.active > .badge,
display: block; display: block;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
margin-right: auto;
margin-left: auto;
} }
a.thumbnail:hover, a.thumbnail:hover,
...@@ -5249,11 +5251,6 @@ a.thumbnail.active { ...@@ -5249,11 +5251,6 @@ a.thumbnail.active {
border-color: #428bca; border-color: #428bca;
} }
.thumbnail > img {
margin-right: auto;
margin-left: auto;
}
.thumbnail .caption { .thumbnail .caption {
padding: 9px; padding: 9px;
color: #333333; color: #333333;
......
dist/css/bootstrap.min.css
View file @ 697a37e7
This source diff could not be displayed because it is too large. You can view the blob instead.
less/thumbnails.less
View file @ 697a37e7
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
> img { > img {
.img-responsive(); .img-responsive();
margin-left: auto;
margin-right: auto;
} }
} }
...@@ -22,11 +24,7 @@ a.thumbnail.active { ...@@ -22,11 +24,7 @@ a.thumbnail.active {
border-color: @link-color; border-color: @link-color;
} }
// Images and captions // Image captions
.thumbnail > img {
margin-left: auto;
margin-right: auto;
}
.thumbnail .caption { .thumbnail .caption {
padding: @thumbnail-caption-padding; padding: @thumbnail-caption-padding;
color: @thumbnail-caption-color; color: @thumbnail-caption-color;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment