rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

revert to negative margin on grid row

Browse Source
This commit is contained in:
Mark Otto 2012-01-23 11:35:39 -08:00
parent 22fa371259
commit 00d9258194
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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: Mon Jan 23 11:25:06 PST 2012 * Date: Mon Jan 23 11:35:22 PST 2012
*/ */
article, article,
aside, aside,
@ -160,6 +160,7 @@ 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 {
@ -169,9 +170,6 @@ 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;
@ -2673,7 +2671,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
} }
.thumbnails > li { .thumbnails > li {
float: left; float: left;
margin: 0 0 20px 20px; margin: 0 0 18px 20px;
} }
.thumbnail { .thumbnail {
display: block; display: block;

5
bootstrap.min.css vendored
View File

@ -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;} .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
.fluid-content{float:left;width:100%;} .fluid-content{float:left;width:100%;}
a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;} 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;} .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;}
@ -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;} .alert-block p+p{margin-top:5px;}
.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
.thumbnails:after{clear:both;} .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);} .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);} 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%;} .thumbnail>img{display:block;max-width:100%;}

5
lib/scaffolding.less
View File

@ -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 // 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 * -1;
.clearfix(); .clearfix();
} }
[class*="span"]:first-child{
margin-left: 0;
}
// Find all .span# classes within .row and give them the necessary properties for grid columns // Find all .span# classes within .row and give them the necessary properties for grid columns
// (supported by all browsers back to IE7) // (supported by all browsers back to IE7)
// Credit to @dhg for the idea // Credit to @dhg for the idea

2
lib/thumbnails.less
View File

@ -8,7 +8,7 @@
} }
.thumbnails > li { .thumbnails > li {
float: left; float: left;
margin: 0 0 20px 20px; margin: 0 0 @baseLineHeight 20px;
} }
.thumbnail { .thumbnail {
display: block; display: block;