diff options
| author | Mark Otto <[email protected]> | 2011-10-16 03:00:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-16 03:00:58 -0700 |
| commit | 9e9109469e5c86c4232cc744639b286bcd9ef0ba (patch) | |
| tree | 64ee59435ab9be44246fdb62ba70fffe1c525413 /lib | |
| parent | fbe22f05800a3ce4ae3a880914d8e03cb1e01d1b (diff) | |
| download | bootstrap-9e9109469e5c86c4232cc744639b286bcd9ef0ba.tar.xz bootstrap-9e9109469e5c86c4232cc744639b286bcd9ef0ba.zip | |
biiiiiig update coming for responsiveness
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mixins.less | 3 | ||||
| -rw-r--r-- | lib/scaffolding.less | 27 | ||||
| -rw-r--r-- | lib/variables.less | 4 |
3 files changed, 6 insertions, 28 deletions
diff --git a/lib/mixins.less b/lib/mixins.less index 22a30a1c8..16ea91ba4 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -101,9 +101,6 @@ -webkit-border-radius: @radius; -moz-border-radius: @radius; border-radius: @radius; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .border-radius-custom(@topLeft, @topRight, @bottomRight, @bottomLeft) { -webkit-border-top-left-radius: @topLeft; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 00a8ee3b3..01fcd9e77 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -84,10 +84,8 @@ a { // GRID SYSTEM // ----------- // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there - .row { .clearfix(); - margin-left: -1 * @gridGutterWidth; } // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7) @@ -95,6 +93,10 @@ a { [class*="span"] { .gridColumn(); } +// Kill the margin on the first column +.row > [class*="span"]:first-child { + margin-left: 0; +} // Default columns .span1 { .columns(1); } @@ -109,20 +111,6 @@ a { .span10 { .columns(10); } .span11 { .columns(11); } .span12 { .columns(12); } -.span13 { .columns(13); } -.span14 { .columns(14); } -.span15 { .columns(15); } -.span16 { .columns(16); } - -// For optional 24-column grid -.span17 { .columns(17); } -.span18 { .columns(18); } -.span19 { .columns(19); } -.span20 { .columns(20); } -.span21 { .columns(21); } -.span22 { .columns(22); } -.span23 { .columns(23); } -.span24 { .columns(24); } // Offset column options .offset1 { .offset(1); } @@ -136,10 +124,3 @@ a { .offset9 { .offset(9); } .offset10 { .offset(10); } .offset11 { .offset(11); } -.offset12 { .offset(12); } - -// Unique column sizes for 16-column grid -.span-one-third { width: 300px; } -.span-two-thirds { width: 620px; } -.offset-one-third { margin-left: 340px; } -.offset-two-thirds { margin-left: 660px; } diff --git a/lib/variables.less b/lib/variables.less index f85e0ec85..24eb8b45a 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -38,8 +38,8 @@ // ---- // Modify the grid styles in mixins.less -@gridColumns: 16; -@gridColumnWidth: 40px; +@gridColumns: 12; +@gridColumnWidth: 60px; @gridGutterWidth: 20px; @extraSpace: (@gridGutterWidth * 2); // For our grid calculations @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); |
