diff options
| author | Julian Kornberger <jk+github@digineo.de> | 2012-04-05 02:18:03 +0400 |
|---|---|---|
| committer | Thomas McDonald <tom@conceptcoding.co.uk> | 2012-04-16 20:03:09 +0400 |
| commit | c322fa1154931a1dc41d1da8788e44fd71b52293 (patch) | |
| tree | 4ea1fd6d2864a07fd2c07c06ff6651dda60ac83a | |
| parent | 7ddba78a1b9b7d98d877e559f646370f99f712ad (diff) | |
variables for small and large grids added
| -rw-r--r-- | vendor/assets/stylesheets/_bootstrap-responsive.scss | 16 | ||||
| -rw-r--r-- | vendor/assets/stylesheets/bootstrap/_variables.scss | 36 |
2 files changed, 38 insertions, 14 deletions
diff --git a/vendor/assets/stylesheets/_bootstrap-responsive.scss b/vendor/assets/stylesheets/_bootstrap-responsive.scss index c1b9c0be..ebf9de5e 100644 --- a/vendor/assets/stylesheets/_bootstrap-responsive.scss +++ b/vendor/assets/stylesheets/_bootstrap-responsive.scss @@ -181,13 +181,13 @@ @media (min-width: $mediaTablet) and (max-width: $mediaDesktop - 1) { // Fixed grid - @include gridCore(42px, 20px); + @include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet); // Fluid grid - @include gridFluid(5.801104972%, 2.762430939%); + @include gridFluid($fluidGridColumnWidthTablet, $fluidGridGutterWidthTablet); // Input grid - @include gridInput(42px, 20px); + @include gridInput($gridColumnWidthTablet, $gridGutterWidthTablet); } @@ -329,20 +329,20 @@ @media (min-width: $mediaLarge) { // Fixed grid - @include gridCore(70px, 30px); + @include gridCore($gridColumnWidthLarge, $gridGutterWidthLarge); // Fluid grid - @include gridFluid(5.982905983%, 2.564102564%); + @include gridFluid($fluidGridColumnWidthLarge, $fluidGridGutterWidthLarge); // Input grid - @include gridInput(70px, 30px); + @include gridInput($gridColumnWidthLarge, $gridGutterWidthLarge); // Thumbnails .thumbnails { - margin-left: -30px; + margin-left: -$gridGutterWidthLarge; } .thumbnails > li { - margin-left: 30px; + margin-left: $gridGutterWidthLarge; } }
\ No newline at end of file diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index 23bd5cf0..e5779dde 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -174,25 +174,49 @@ $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default; -// GRID +// FIXED GRID // -------------------------------------------------- -// Default 940px grid +// Default, 940px // ------------------------- $gridColumns: 12 !default; $gridColumnWidth: 60px !default; $gridGutterWidth: 20px !default; $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default; +// Portrait tablet to default desktop +// ------------------------- +$gridColumnWidthTablet: 42px !default; +$gridGutterWidthTablet: 20px !default; + +// Large desktop and up +// ------------------------- +$gridColumnWidthLarge: 70px !default; +$gridGutterWidthLarge: 30px !default; + + + +// FLUID GRID +// -------------------------------------------------- + +// Default +// ------------------------- +$fluidGridColumnWidth: 6.382978723% !default; +$fluidGridGutterWidth: 2.127659574% !default; + +// Portrait tablet to default desktop +// ------------------------- +$fluidGridColumnWidthTablet: 5.801104972% !default; +$fluidGridGutterWidthTablet: 2.762430939% !default; -// Fluid grid +// Large desktop and up // ------------------------- -$fluidGridColumnWidth: 6.382978723% !default; -$fluidGridGutterWidth: 2.127659574% !default; +$fluidGridColumnWidthLarge: 5.982905983% !default; +$fluidGridGutterWidthLarge: 2.564102564% !default; -// Responsive design +// RESPONSIVE DESIGN // -------------------------------------------------- // Media widths |