mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Combine .thumbnail and .img-thumbnail into simpler selectors
This commit is contained in:
parent
ca74b9882b
commit
f068cdeb63
3 changed files with 25 additions and 22 deletions
25
docs/assets/css/bootstrap.css
vendored
25
docs/assets/css/bootstrap.css
vendored
|
@ -262,19 +262,6 @@ img {
|
|||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.img-thumbnail {
|
||||
display: block;
|
||||
display: inline-block;
|
||||
padding: 4px;
|
||||
line-height: 20px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
-webkit-transition: all 0.2s ease-in-out;
|
||||
-moz-transition: all 0.2s ease-in-out;
|
||||
-o-transition: all 0.2s ease-in-out;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.img-circle {
|
||||
border-radius: 500px;
|
||||
}
|
||||
|
@ -3932,8 +3919,8 @@ button.close {
|
|||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.thumbnail {
|
||||
display: block;
|
||||
.thumbnail,
|
||||
.img-thumbnail {
|
||||
padding: 4px;
|
||||
line-height: 20px;
|
||||
border: 1px solid #ddd;
|
||||
|
@ -3944,6 +3931,14 @@ button.close {
|
|||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.thumbnail {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.img-thumbnail {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a.thumbnail:hover {
|
||||
border-color: #428bca;
|
||||
}
|
||||
|
|
|
@ -78,10 +78,7 @@ img {
|
|||
}
|
||||
|
||||
// Image thumbnails
|
||||
.img-thumbnail {
|
||||
.thumbnail();
|
||||
display: inline-block;
|
||||
}
|
||||
// See thumbnails.less for `.img-thumbnail`
|
||||
|
||||
// Perfect circle
|
||||
.img-circle {
|
||||
|
|
|
@ -3,15 +3,26 @@
|
|||
// --------------------------------------------------
|
||||
|
||||
|
||||
// The actual thumbnail (can be `a` or `div`)
|
||||
.thumbnail {
|
||||
display: block;
|
||||
// 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: 4px;
|
||||
line-height: @line-height-base;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: @border-radius-base;
|
||||
.transition(all .2s ease-in-out);
|
||||
}
|
||||
.thumbnail {
|
||||
display: block;
|
||||
}
|
||||
.img-thumbnail {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
// Add a hover state for linked versions only
|
||||
a.thumbnail:hover {
|
||||
border-color: @link-color;
|
||||
|
|
Loading…
Reference in a new issue