diff options
| author | Mark Otto <[email protected]> | 2011-10-16 23:04:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-16 23:04:31 -0700 |
| commit | e7d2218b2043742f21c368d074d97a4bde275730 (patch) | |
| tree | 5d79c0af1a67b6937c51233da958a86f1e4abf8b /lib | |
| parent | c62a0239bd30a12e9f0d8c1e45f5818460e9df90 (diff) | |
| download | bootstrap-e7d2218b2043742f21c368d074d97a4bde275730.tar.xz bootstrap-e7d2218b2043742f21c368d074d97a4bde275730.zip | |
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mixins.less | 9 | ||||
| -rw-r--r-- | lib/patterns.less | 6 | ||||
| -rw-r--r-- | lib/responsive.less | 2 | ||||
| -rw-r--r-- | lib/scaffolding.less | 5 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/mixins.less b/lib/mixins.less index 47857f1fa..5b05654d5 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -78,12 +78,13 @@ margin-right: auto; .clearfix(); } -.columns(@columnSpan: 1) { - width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); +.columns(@columns: 1) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); } -.offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; +.offset(@columns: 1) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); } + // Necessary grid styles for every column to make them appear next to each other horizontally .gridColumn() { display: inline; diff --git a/lib/patterns.less b/lib/patterns.less index 950ac2feb..f1badc46d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -520,11 +520,11 @@ footer { // ------------ .page-header { - margin-bottom: @baseLineHeight - 1; - border-bottom: 1px solid #ddd; + margin-bottom: @baseLineHeight * 1.5; + border-bottom: 1px solid #eee; .box-shadow(0 1px 0 rgba(255,255,255,.5)); h1 { - margin-bottom: (@baseLineHeight / 2) - 1px; + margin-bottom: @baseLineHeight * .75; } } diff --git a/lib/responsive.less b/lib/responsive.less index 900df4c75..a1a33164f 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -121,6 +121,7 @@ } +/* // LARGE DESKTOP & UP // ------------------ @@ -176,3 +177,4 @@ .offset12 { .offset(12); } } +*/
\ No newline at end of file diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 01fcd9e77..f15f6853c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -85,6 +85,7 @@ 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; .clearfix(); } @@ -93,10 +94,6 @@ a { [class*="span"] { .gridColumn(); } -// Kill the margin on the first column -.row > [class*="span"]:first-child { - margin-left: 0; -} // Default columns .span1 { .columns(1); } |