mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 23:26:40 +02:00
Code Issues Releases Wiki Activity

Merge pull request #11282 from ZDroid/combination

Browse Source 
Combine multiple .thumbnail > img styles
This commit is contained in:
Mark Otto
2013-10-30 07:28:24 -07:00
parent 77bf572cba 688ca328c9
commit 697a37e73f
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/bootstrap.css vendored
View File

@@ -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 {
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;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
less/thumbnails.less
View File

@@ -11,6 +11,8 @@
> img { > img {
.img-responsive(); .img-responsive();
margin-left: auto;
margin-right: auto;
} }
} }
@@ -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;