Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
f068cdeb
Commit
f068cdeb
authored
Jan 17, 2013
by
Mark Otto
Browse files
Options
Browse Files
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
with
25 additions
and
22 deletions
+25
-22
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+10
-15
less/scaffolding.less
less/scaffolding.less
+1
-4
less/thumbnails.less
less/thumbnails.less
+14
-3
No files found.
docs/assets/css/bootstrap.css
View file @
f068cdeb
...
@@ -262,19 +262,6 @@ img {
...
@@ -262,19 +262,6 @@ img {
border-radius
:
6px
;
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
{
.img-circle
{
border-radius
:
500px
;
border-radius
:
500px
;
}
}
...
@@ -3932,8 +3919,8 @@ button.close {
...
@@ -3932,8 +3919,8 @@ button.close {
margin-top
:
5px
;
margin-top
:
5px
;
}
}
.thumbnail
{
.thumbnail
,
display
:
block
;
.img-thumbnail
{
padding
:
4px
;
padding
:
4px
;
line-height
:
20px
;
line-height
:
20px
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
#ddd
;
...
@@ -3944,6 +3931,14 @@ button.close {
...
@@ -3944,6 +3931,14 @@ button.close {
transition
:
all
0.2s
ease-in-out
;
transition
:
all
0.2s
ease-in-out
;
}
}
.thumbnail
{
display
:
block
;
}
.img-thumbnail
{
display
:
inline-block
;
}
a
.thumbnail
:hover
{
a
.thumbnail
:hover
{
border-color
:
#428bca
;
border-color
:
#428bca
;
}
}
...
...
less/scaffolding.less
View file @
f068cdeb
...
@@ -78,10 +78,7 @@ img {
...
@@ -78,10 +78,7 @@ img {
}
}
// Image thumbnails
// Image thumbnails
.img-thumbnail {
// See thumbnails.less for `.img-thumbnail`
.thumbnail();
display: inline-block;
}
// Perfect circle
// Perfect circle
.img-circle {
.img-circle {
...
...
less/thumbnails.less
View file @
f068cdeb
...
@@ -3,15 +3,26 @@
...
@@ -3,15 +3,26 @@
// --------------------------------------------------
// --------------------------------------------------
// The actual thumbnail (can be `a` or `div`)
// Base classes
.thumbnail {
// For thumbnail block-level composite components and simple image styles
display: block;
// The actual thumbnailed element
// Can be `a`, `div`, or `img`
.thumbnail,
.img-thumbnail {
padding: 4px;
padding: 4px;
line-height: @line-height-base;
line-height: @line-height-base;
border: 1px solid #ddd;
border: 1px solid #ddd;
border-radius: @border-radius-base;
border-radius: @border-radius-base;
.transition(all .2s ease-in-out);
.transition(all .2s ease-in-out);
}
}
.thumbnail {
display: block;
}
.img-thumbnail {
display: inline-block;
}
// Add a hover state for linked versions only
// Add a hover state for linked versions only
a.thumbnail:hover {
a.thumbnail:hover {
border-color: @link-color;
border-color: @link-color;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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