Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
00cbadf9
Commit
00cbadf9
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
update thumbnails to keep images from going past edges of thumbnails
parent
af5793e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.css
+3
-2
bootstrap.css
bootstrap.min.css
+2
-2
bootstrap.min.css
lib/thumbnails.less
+2
-1
lib/thumbnails.less
with
7 additions
and
5 deletions
+7
-5
bootstrap.css
+
3
-
2
View file @
00cbadf9
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Dec 21 1
6
:2
6:02
CST 2011
* Date: Wed Dec 21 1
8
:2
0:33
CST 2011
*/
html
,
body
{
margin
:
0
;
...
...
@@ -2615,6 +2615,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
}
.thumbnail
{
display
:
block
;
padding
:
4px
;
line-height
:
1
;
border
:
1px
solid
#ddd
;
-webkit-border-radius
:
4px
;
...
...
@@ -2632,7 +2633,7 @@ a.thumbnail:hover {
}
.thumbnail
>
img
{
display
:
block
;
ma
rgin
:
4px
;
ma
x-width
:
100%
;
}
.thumbnail
.caption
{
padding
:
9px
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
2
View file @
00cbadf9
...
...
@@ -338,9 +338,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.thumbnails
{
margin-left
:
-20px
;
margin-bottom
:
0
;
list-style
:
none
;
zoom
:
1
;}
.thumbnails
:before
,
.thumbnails
:after
{
display
:
table
;
*
display
:
inline
;
content
:
""
;
zoom
:
1
;}
.thumbnails
:after
{
clear
:
both
;}
.thumbnails
>
li
{
float
:
left
;
margin
:
0
0
20px
20px
;}
.thumbnail
{
display
:
block
;
line-height
:
1
;
border
:
1px
solid
#ddd
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
-webkit-box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);
-moz-box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);}
.thumbnail
{
display
:
block
;
padding
:
4px
;
line-height
:
1
;
border
:
1px
solid
#ddd
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
-webkit-box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);
-moz-box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);}
a
.thumbnail
:hover
{
border-color
:
#0069d6
;
-webkit-box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);
-moz-box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);
box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);}
.thumbnail
>
img
{
display
:
block
;
ma
rgin
:
4px
;}
.thumbnail
>
img
{
display
:
block
;
ma
x-width
:
100%
;}
.thumbnail
.caption
{
padding
:
9px
;}
.hidden
{
display
:
none
;
visibility
:
hidden
;}
@media
(
max-width
:
480px
){
.modal
{
width
:
auto
;
margin
:
0
;}
.horizontal-form
.control-group
>
label
{
float
:
none
;
width
:
auto
;
padding-top
:
0
;
text-align
:
left
;}
.horizontal-form
.controls
{
margin-left
:
0
;}
.horizontal-form
.control-list
{
padding-top
:
0
;}
.horizontal-form
.form-actions
{
padding-left
:
0
;}}
@media
(
max-width
:
768px
){
.container
{
width
:
auto
;
padding
:
0
20px
;}
.row
{
margin-left
:
0
;}
[
class
*=
"span"
]
{
float
:
none
;
display
:
block
;
width
:
auto
;
margin
:
0
;}
.nav
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
180px
;
padding-top
:
40px
;
list-style
:
none
;}
.nav
,
.nav
>
li
:last-child
a
{
-webkit-border-radius
:
0
0
4px
0
;
-moz-border-radius
:
0
0
4px
0
;
border-radius
:
0
0
4px
0
;}
.nav
>
li
{
float
:
none
;
display
:
none
;}
.nav
>
li
>
a
{
float
:
none
;
background-color
:
#222
;}
.nav
>
.active
{
display
:
block
;
position
:
absolute
;
top
:
0
;
left
:
0
;}
.navbar
ul
.active
>
a
{
background-color
:
transparent
;}
.nav
>
.active
a
:after
{
display
:
inline-block
;
width
:
0
;
height
:
0
;
margin-top
:
8px
;
margin-left
:
6px
;
text-indent
:
-99999px
;
vertical-align
:
top
;
border-left
:
4px
solid
transparent
;
border-right
:
4px
solid
transparent
;
border-top
:
4px
solid
#ffffff
;
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;
content
:
"↓"
;}
.nav
>
.active
a
:hover
{
background-color
:
rgba
(
255
,
255
,
255
,
0.05
);}}
@media
(
min-width
:
768px
)
and
(
max-width
:
940px
){
.container
{
width
:
748px
;}
.span1
{
width
:
44px
;}
.span2
{
width
:
108px
;}
.span3
{
width
:
172px
;}
.span4
{
width
:
236px
;}
.span5
{
width
:
300px
;}
.span6
{
width
:
364px
;}
.span7
{
width
:
428px
;}
.span8
{
width
:
492px
;}
.span9
{
width
:
556px
;}
.span10
{
width
:
620px
;}
.span11
{
width
:
684px
;}
.span12
{
width
:
748px
;}
.offset1
{
margin-left
:
64px
;}
.offset2
{
margin-left
:
128px
;}
.offset3
{
margin-left
:
192px
;}
.offset4
{
margin-left
:
256px
;}
.offset5
{
margin-left
:
320px
;}
.offset6
{
margin-left
:
384px
;}
.offset7
{
margin-left
:
448px
;}
.offset8
{
margin-left
:
512px
;}
.offset9
{
margin-left
:
576px
;}
.offset10
{
margin-left
:
640px
;}
.offset11
{
margin-left
:
704px
;}
.offset12
{
margin-left
:
768px
;}}
This diff is collapsed.
Click to expand it.
lib/thumbnails.less
+
2
-
1
View file @
00cbadf9
...
...
@@ -13,6 +13,7 @@
}
.thumbnail {
display: block;
padding: 4px;
line-height: 1;
border: 1px solid #ddd;
.border-radius(4px);
...
...
@@ -26,7 +27,7 @@ a.thumbnail:hover {
// Images and captions
.thumbnail > img {
display: block;
ma
rgin: 4px
;
ma
x-width: 100%
;
}
.thumbnail .caption {
padding: 9px;
...
...
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
Menu
Explore
Projects
Groups
Snippets