From 56c04a448021b1504bd29c27c00a82eda8f1c7df Mon Sep 17 00:00:00 2001 From: Brandon Arnold Date: Fri, 8 Jan 2016 11:29:59 -0800 Subject: [PATCH] adding padding --- scss/ink.scss | 13 ++++++++++--- scss/ink/components/_global.scss | 4 ++++ scss/ink/components/_grid.scss | 17 ++++++++++++----- scss/ink/components/_media-query.scss | 8 ++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/scss/ink.scss b/scss/ink.scss index fcd1c9a6..8598e31a 100755 --- a/scss/ink.scss +++ b/scss/ink.scss @@ -20,14 +20,21 @@ $foundation-version: '2.0.0-alpha'; 'ink/components/outlook-first', 'ink/components/media-query'; +body { + background-color: #eeeeee; +} + +.container { + background-color: #ffffff; +} -//my overrides +//my overrides .header { background: #999999; } .sub-header { - text-align: right; + text-align: right; vertical-align: middle; } @@ -107,4 +114,4 @@ table.columns .right-text-pad { table[class="body"] .left-text-pad { padding-right: 10px !important; } -} \ No newline at end of file +} diff --git a/scss/ink/components/_global.scss b/scss/ink/components/_global.scss index 98818698..532fe09a 100755 --- a/scss/ink/components/_global.scss +++ b/scss/ink/components/_global.scss @@ -60,6 +60,10 @@ $column-gutter: 20px !default; /// @type Number $container-width: 580px !default; +/// Color for the container background +/// @type Color +$container-background-color: $white !default; + /// Global raidus of radius-corners. /// @type Number $global-radius: 3px !default; diff --git a/scss/ink/components/_grid.scss b/scss/ink/components/_grid.scss index 181ca66e..c11a6380 100755 --- a/scss/ink/components/_grid.scss +++ b/scss/ink/components/_grid.scss @@ -47,13 +47,13 @@ table.container table.row { display: block; } -td.wrapper { +table.wrapper { padding: $wrapper-padding-top $column-gutter 0 0; position: relative; } -table.columns, -table.column { +td.columns, +td.column { margin: 0 auto; } @@ -68,13 +68,13 @@ table.container td.last { } @for $i from 1 through $grid-column-count { - table.large-#{$i} { + td.large-#{$i} { width: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter); } } @for $i from 1 through $grid-column-count { - table.large-#{$i} center { + td.large-#{$i} center { min-width: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter); } } @@ -117,3 +117,10 @@ table.column .right-text-pad, table.column .text-pad-right { padding-right: $text-padding; } + + + + +table.gutter { + margin: 10px; +} diff --git a/scss/ink/components/_media-query.scss b/scss/ink/components/_media-query.scss index 05cfecce..ffd2da96 100755 --- a/scss/ink/components/_media-query.scss +++ b/scss/ink/components/_media-query.scss @@ -44,9 +44,9 @@ $small-range: $container-width !default; table[class="body"] .columns, table[class="body"] .column { - display: block; - float: left; - height: auto; + display: block !important; + float: left !important; + height: auto !important; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -94,7 +94,7 @@ $small-range: $container-width !default; table[class="body"] table.columns td.expander { // width: 1px !important; - display: none; + display: none !important; } table[class="body"] .right-text-pad, -- 2.47.2