aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-24 06:45:21 -0700
committerMark Otto <[email protected]>2012-04-24 06:45:21 -0700
commit5be84ad0b7156edcd53d4c1ef81ad0f8cf0cbe4b (patch)
tree589e6975e89e4446b7b64c8773e11377528e991a
parentf9744ff52207617ec4610809603f34d7eba1d077 (diff)
downloadbootstrap-5be84ad0b7156edcd53d4c1ef81ad0f8cf0cbe4b.tar.xz
bootstrap-5be84ad0b7156edcd53d4c1ef81ad0f8cf0cbe4b.zip
restore margins on thumbnails, add comments about it's changes and how responsive affects it
-rw-r--r--docs/assets/css/bootstrap-responsive.css3
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/close.less2
-rw-r--r--less/responsive-1200px-min.less3
-rw-r--r--less/responsive-768px-979px.less2
-rw-r--r--less/thumbnails.less2
6 files changed, 13 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4f6eb75ba..7f669d573 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -671,6 +671,9 @@
.thumbnails {
margin-left: -30px;
}
+ .thumbnails > li {
+ margin-left: 30px;
+ }
.row-fluid .thumbnails {
margin-left: 0;
}
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 863e5230c..f13cad826 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2549,7 +2549,7 @@ table .span24 {
button.close {
padding: 0;
cursor: pointer;
- background-color: transparent;
+ background: transparent;
border: 0;
-webkit-appearance: none;
}
@@ -4449,6 +4449,7 @@ input[type="submit"].btn.btn-mini {
.thumbnails > li {
float: left;
margin-bottom: 18px;
+ margin-left: 20px;
}
.thumbnail {
diff --git a/less/close.less b/less/close.less
index e264fca2d..31fe6fcb3 100644
--- a/less/close.less
+++ b/less/close.less
@@ -23,7 +23,7 @@
button.close {
padding: 0;
cursor: pointer;
- background-color: transparent;
+ background: transparent;
border: 0;
-webkit-appearance: none;
} \ No newline at end of file
diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
index 3331cfe5b..a7c9f4e00 100644
--- a/less/responsive-1200px-min.less
+++ b/less/responsive-1200px-min.less
@@ -16,6 +16,9 @@
.thumbnails {
margin-left: -30px;
}
+ .thumbnails > li {
+ margin-left: 30px;
+ }
.row-fluid .thumbnails {
margin-left: 0;
}
diff --git a/less/responsive-768px-979px.less b/less/responsive-768px-979px.less
index 10dda4b02..76f4f6df1 100644
--- a/less/responsive-768px-979px.less
+++ b/less/responsive-768px-979px.less
@@ -12,4 +12,6 @@
// Input grid
#grid > .input(42px, 20px);
+ // No need to reset .thumbnails here since it's the same @gridGutterWidth
+
}
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 012def577..aa69f8e33 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -1,5 +1,6 @@
// THUMBNAILS
// ----------
+// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
// Make wrapper ul behave like the grid
.thumbnails {
@@ -16,6 +17,7 @@
.thumbnails > li {
float: left; // Explicity set the float since we don't require .span* classes
margin-bottom: @baseLineHeight;
+ margin-left: @gridGutterWidth;
}
// The actual thumbnail (can be `a` or `div`)