rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00
Code Issues Actions Packages Releases Activity

don't use negative margin - use first child to set to 0

Browse Source
This commit is contained in:
Jacob Thornton 2012-01-22 20:12:26 -08:00
parent b8c0388f8a
commit 36d56fb1ba
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 22 20:06:46 PST 2012 * Date: Sun Jan 22 20:11:39 PST 2012
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -238,7 +238,6 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
.row { .row {
margin-left: -20px;
*zoom: 1; *zoom: 1;
} }
.row:before, .row:after { .row:before, .row:after {
@ -248,6 +247,9 @@ a:hover {
.row:after { .row:after {
clear: both; clear: both;
} }
[class*="span"]:first-child {
margin-left: 0;
}
[class*="span"] { [class*="span"] {
float: left; float: left;
margin-left: 20px; margin-left: 20px;

3
bootstrap.min.css vendored
View File

@ -32,8 +32,9 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.sidebar-right .fluid-sidebar{float:right;margin-right:-240px;} .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
.fluid-content{float:left;width:100%;} .fluid-content{float:left;width:100%;}
a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;} a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;} .row:after{clear:both;}
[class*="span"]:first-child{margin-left:0;}
[class*="span"]{float:left;margin-left:20px;} [class*="span"]{float:left;margin-left:20px;}
.span1{width:60px;} .span1{width:60px;}
.span2{width:140px;} .span2{width:140px;}

8
lib/scaffolding.less
View File

@ -75,11 +75,15 @@ a {
// ----------- // -----------
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row { .row {
margin-left: -@gridGutterWidth;
.clearfix(); .clearfix();
} }
// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7) [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 // Credit to @dhg for the idea
[class*="span"] { [class*="span"] {
.gridColumn(); .gridColumn();