Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
f068cdeb
Commit
f068cdeb
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Combine .thumbnail and .img-thumbnail into simpler selectors
parent
ca74b988
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+10
-15
docs/assets/css/bootstrap.css
less/scaffolding.less
+1
-4
less/scaffolding.less
less/thumbnails.less
+14
-3
less/thumbnails.less
with
25 additions
and
22 deletions
+25
-22
docs/assets/css/bootstrap.css
+
10
-
15
View file @
f068cdeb
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
less/scaffolding.less
+
1
-
4
View file @
f068cdeb
...
...
@@ -78,10 +78,7 @@ img {
}
// Image thumbnails
.img-thumbnail {
.thumbnail();
display: inline-block;
}
// See thumbnails.less for `.img-thumbnail`
// Perfect circle
.img-circle {
...
...
This diff is collapsed.
Click to expand it.
less/thumbnails.less
+
14
-
3
View file @
f068cdeb
...
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment