rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin

Browse Source
This commit is contained in:
Mark Otto 2011-10-16 03:08:14 -07:00
parent 9e9109469e
commit be926a04bc
4 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
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 Oct 16 02:59:54 PDT 2011 * Date: Sun Oct 16 03:07:49 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@ -316,37 +316,37 @@ a:hover {
width: 940px; width: 940px;
} }
.offset1 { .offset1 {
margin-left: 100px; margin-left: 80px;
} }
.offset2 { .offset2 {
margin-left: 180px; margin-left: 160px;
} }
.offset3 { .offset3 {
margin-left: 260px; margin-left: 240px;
} }
.offset4 { .offset4 {
margin-left: 340px; margin-left: 320px;
} }
.offset5 { .offset5 {
margin-left: 420px; margin-left: 400px;
} }
.offset6 { .offset6 {
margin-left: 500px; margin-left: 480px;
} }
.offset7 { .offset7 {
margin-left: 580px; margin-left: 560px;
} }
.offset8 { .offset8 {
margin-left: 660px; margin-left: 640px;
} }
.offset9 { .offset9 {
margin-left: 740px; margin-left: 720px;
} }
.offset10 { .offset10 {
margin-left: 820px; margin-left: 800px;
} }
.offset11 { .offset11 {
margin-left: 900px; margin-left: 880px;
} }
/* Typography.less /* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
@ -2367,9 +2367,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
width: 1170px; width: 1170px;
} }
[class*="span"] { [class*="span"] {
display: inline; margin-left: 30px;
float: left;
margin-left: 20px;
} }
.span1 { .span1 {
width: 70px; width: 70px;
@ -2408,39 +2406,39 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
width: 1170px; width: 1170px;
} }
.offset1 { .offset1 {
margin-left: 130px; margin-left: 100px;
} }
.offset2 { .offset2 {
margin-left: 230px; margin-left: 200px;
} }
.offset3 { .offset3 {
margin-left: 330px; margin-left: 300px;
} }
.offset4 { .offset4 {
margin-left: 430px; margin-left: 400px;
} }
.offset5 { .offset5 {
margin-left: 530px; margin-left: 500px;
} }
.offset6 { .offset6 {
margin-left: 630px; margin-left: 600px;
} }
.offset7 { .offset7 {
margin-left: 730px; margin-left: 700px;
} }
.offset8 { .offset8 {
margin-left: 830px; margin-left: 800px;
} }
.offset9 { .offset9 {
margin-left: 930px; margin-left: 900px;
} }
.offset10 { .offset10 {
margin-left: 1030px; margin-left: 1000px;
} }
.offset11 { .offset11 {
margin-left: 1130px; margin-left: 1100px;
} }
.offset12 { .offset12 {
margin-left: 1230px; margin-left: 1200px;
} }
} }

24
bootstrap.min.css vendored
View File

@ -52,17 +52,17 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
.span10{width:780px;} .span10{width:780px;}
.span11{width:860px;} .span11{width:860px;}
.span12{width:940px;} .span12{width:940px;}
.offset1{margin-left:100px;} .offset1{margin-left:80px;}
.offset2{margin-left:180px;} .offset2{margin-left:160px;}
.offset3{margin-left:260px;} .offset3{margin-left:240px;}
.offset4{margin-left:340px;} .offset4{margin-left:320px;}
.offset5{margin-left:420px;} .offset5{margin-left:400px;}
.offset6{margin-left:500px;} .offset6{margin-left:480px;}
.offset7{margin-left:580px;} .offset7{margin-left:560px;}
.offset8{margin-left:660px;} .offset8{margin-left:640px;}
.offset9{margin-left:740px;} .offset9{margin-left:720px;}
.offset10{margin-left:820px;} .offset10{margin-left:800px;}
.offset11{margin-left:900px;} .offset11{margin-left:880px;}
p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
@ -322,4 +322,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.media-grid li{display:inline;} .media-grid li{display:inline;}
.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;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);}.media-grid a img{display:block;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;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);}.media-grid a img{display:block;}
.media-grid a:hover{border-color:#0069d6;-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);} .media-grid a:hover{border-color:#0069d6;-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);}
@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:28px;} .span2{width:76px;} .span3{width:124px;} .span4{width:172px;} .span5{width:220px;} .span6{width:268px;} .span7{width:316px;} .span8{width:364px;} .span9{width:412px;} .span10{width:460px;} .span11{width:508px;} .span12{width:556px;} .offset1{margin-left:68px;} .offset2{margin-left:116px;} .offset3{margin-left:164px;} .offset4{margin-left:212px;} .offset5{margin-left:260px;} .offset6{margin-left:308px;} .offset7{margin-left:356px;} .offset8{margin-left:404px;} .offset9{margin-left:452px;} .offset10{margin-left:500px;} .offset11{margin-left:548px;} .offset12{margin-left:596px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{display:inline;float:left;margin-left:20px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .offset12{margin-left:1230px;}} @media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:28px;} .span2{width:76px;} .span3{width:124px;} .span4{width:172px;} .span5{width:220px;} .span6{width:268px;} .span7{width:316px;} .span8{width:364px;} .span9{width:412px;} .span10{width:460px;} .span11{width:508px;} .span12{width:556px;} .offset1{margin-left:68px;} .offset2{margin-left:116px;} .offset3{margin-left:164px;} .offset4{margin-left:212px;} .offset5{margin-left:260px;} .offset6{margin-left:308px;} .offset7{margin-left:356px;} .offset8{margin-left:404px;} .offset9{margin-left:452px;} .offset10{margin-left:500px;} .offset11{margin-left:548px;} .offset12{margin-left:596px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12{width:1170px;} .offset1{margin-left:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}

2
lib/mixins.less
View File

@ -82,7 +82,7 @@
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
} }
.offset(@columnOffset: 1) { .offset(@columnOffset: 1) {
margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
} }
// Necessary grid styles for every column to make them appear next to each other horizontally // Necessary grid styles for every column to make them appear next to each other horizontally
.gridColumn() { .gridColumn() {

1
lib/variables.less
View File

@ -41,7 +41,6 @@
@gridColumns: 12; @gridColumns: 12;
@gridColumnWidth: 60px; @gridColumnWidth: 60px;
@gridGutterWidth: 20px; @gridGutterWidth: 20px;
@extraSpace: (@gridGutterWidth * 2); // For our grid calculations
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));