From 00d925819405ef46fb09d4bef83761ea121a9364 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 23 Jan 2012 11:35:39 -0800
Subject: [PATCH] revert to negative margin on grid row
---
bootstrap.css | 8 +++-----
bootstrap.min.css | 5 ++---
lib/scaffolding.less | 5 +----
lib/thumbnails.less | 2 +-
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/bootstrap.css b/bootstrap.css
index 85a3edb6f7..fc0337f6dc 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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: Mon Jan 23 11:25:06 PST 2012
+ * Date: Mon Jan 23 11:35:22 PST 2012
*/
article,
aside,
@@ -160,6 +160,7 @@ a:hover {
text-decoration: underline;
}
.row {
+ margin-left: -20px;
*zoom: 1;
}
.row:before, .row:after {
@@ -169,9 +170,6 @@ a:hover {
.row:after {
clear: both;
}
-[class*="span"]:first-child {
- margin-left: 0;
-}
[class*="span"] {
float: left;
margin-left: 20px;
@@ -2673,7 +2671,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
}
.thumbnails > li {
float: left;
- margin: 0 0 20px 20px;
+ margin: 0 0 18px 20px;
}
.thumbnail {
display: block;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 172e7961be..bee4eb82a2 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -27,9 +27,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
.fluid-content{float:left;width:100%;}
a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;}
-[class*="span"]:first-child{margin-left:0;}
[class*="span"]{float:left;margin-left:20px;}
.span1{width:60px;}
.span2{width:140px;}
@@ -493,7 +492,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.alert-block p+p{margin-top:5px;}
.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
.thumbnails:after{clear:both;}
-.thumbnails>li{float:left;margin:0 0 20px 20px;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
.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:#0088cc;-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;max-width:100%;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 13f55026d7..ff029e841b 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -73,13 +73,10 @@ a {
// -----------
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row {
+ margin-left: @gridGutterWidth * -1;
.clearfix();
}
-[class*="span"]:first-child{
- margin-left: 0;
-}
-
// Find all .span# classes within .row and give them the necessary properties for grid columns
// (supported by all browsers back to IE7)
// Credit to @dhg for the idea
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index 4f9c5f76d3..0ba749059d 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -8,7 +8,7 @@
}
.thumbnails > li {
float: left;
- margin: 0 0 20px 20px;
+ margin: 0 0 @baseLineHeight 20px;
}
.thumbnail {
display: block;
--
GitLab