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
fe05f9ae
Commit
fe05f9ae
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix
#2572
: streamline thumbnails css to allow for offsets
parent
33fa705c
1 merge request
!2929
Responsive video - from zurp's foundation
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
+0
-6
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
+1
-2
docs/assets/css/bootstrap.css
less/responsive-1200px-min.less
+0
-3
less/responsive-1200px-min.less
less/responsive-767px-max.less
+0
-6
less/responsive-767px-max.less
less/tests/css-tests.html
+48
-2
less/tests/css-tests.html
less/thumbnails.less
+7
-2
less/thumbnails.less
with
56 additions
and
21 deletions
+56
-21
docs/assets/bootstrap.zip
+
0
-
0
View file @
fe05f9ae
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap-responsive.css
+
0
-
6
View file @
fe05f9ae
...
...
@@ -164,9 +164,6 @@
width
:
auto
;
margin
:
0
;
}
.thumbnails
[
class
*=
"span"
]
{
width
:
auto
;
}
input
[
class
*=
"span"
],
select
[
class
*=
"span"
],
textarea
[
class
*=
"span"
],
...
...
@@ -597,9 +594,6 @@
.thumbnails
{
margin-left
:
-30px
;
}
.thumbnails
>
li
{
margin-left
:
30px
;
}
}
@media
(
max-width
:
979px
)
{
body
{
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
1
-
2
View file @
fe05f9ae
...
...
@@ -3627,8 +3627,7 @@ input[type="submit"].btn.btn-mini {
clear
:
both
;
}
.thumbnails
>
li
{
float
:
left
;
margin
:
0
0
18px
20px
;
margin-bottom
:
18px
;
}
.thumbnail
{
display
:
block
;
...
...
This diff is collapsed.
Click to expand it.
less/responsive-1200px-min.less
+
0
-
3
View file @
fe05f9ae
...
...
@@ -16,8 +16,5 @@
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
}
}
This diff is collapsed.
Click to expand it.
less/responsive-767px-max.less
+
0
-
6
View file @
fe05f9ae
...
...
@@ -124,12 +124,6 @@
margin: 0;
}
// THUMBNAILS
// ----------
.thumbnails [class*="span"] {
width: auto;
}
// FORM FIELDS
// -----------
// Make span* classes full width
...
...
This diff is collapsed.
Click to expand it.
less/tests/css-tests.html
+
48
-
2
View file @
fe05f9ae
...
...
@@ -329,9 +329,9 @@
</div>
<!--/span-->
</div>
<!--/row-->
</div>
<br>
<!-- Dropdowns
================================================== -->
...
...
@@ -339,7 +339,6 @@
<h1>
Dropdowns
</h1>
</div>
<h4>
Dropdown link with hash URL
</h4>
<ul
class=
"nav nav-pills"
>
<li
class=
"active"
><a
href=
"#"
>
Link
</a></li>
...
...
@@ -375,6 +374,53 @@
</ul>
</li>
</ul>
<br>
<!-- Thumbnails
================================================== -->
<div
class=
"page-header"
>
<h1>
Thumbnails
</h1>
</div>
<h4>
Offset thumbnails
</h4>
<ul
class=
"thumbnails"
>
<li
class=
"span3 offset3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
<li
class=
"span3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
<li
class=
"span3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
</ul>
<ul
class=
"thumbnails"
>
<li
class=
"span3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
<li
class=
"span3 offset3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
<li
class=
"span3"
>
<a
href=
"#"
class=
"thumbnail"
>
<img
src=
"http://placehold.it/260x180"
alt=
""
>
</a>
</li>
</ul>
...
...
This diff is collapsed.
Click to expand it.
less/thumbnails.less
+
7
-
2
View file @
fe05f9ae
// THUMBNAILS
// ----------
// Make wrapper ul behave like the grid
.thumbnails {
margin-left: -@gridGutterWidth;
list-style: none;
.clearfix();
}
// Float li to make thumbnails appear in a row
.thumbnails > li {
float: left;
margin: 0 0 @baseLineHeight @gridGutterWidth;
margin-bottom: @baseLineHeight;
}
// The actual thumbnail (can be `a` or `div`)
.thumbnail {
display: block;
padding: 4px;
...
...
@@ -23,6 +27,7 @@ a.thumbnail:hover {
border-color: @linkColor;
.box-shadow(0 1px 4px rgba(0,105,214,.25));
}
// Images and captions
.thumbnail > img {
display: block;
...
...
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