From ed368b1a9b01354e53300c6801d479a555d50464 Mon Sep 17 00:00:00 2001 From: James Dow Date: Fri, 10 Jan 2020 14:42:50 -0600 Subject: [PATCH] fix(grid): moved vertical spacing to col (#4960) * fix(condensed-grid): moved vertical spacing to col * chore(grid): updating snapshot Co-authored-by: Alessandra Davila Co-authored-by: Josh Black --- .../grid/__tests__/__snapshots__/grid-test.js.snap | 8 +++----- packages/grid/scss/_mixins.scss | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap b/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap index 9c0cbefc9256..d252e81281dc 100644 --- a/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap +++ b/packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap @@ -115,11 +115,9 @@ em { margin-right: -1rem; margin-left: -1rem; } -.bx--grid--condensed .bx--row:not(:last-of-type) { - margin-bottom: 0.125rem; } - -.bx--row--condensed + .bx--row--condensed { - margin-top: 0.125rem; } +.bx--grid--condensed [class*='bx--col'] { + padding-top: 0.0625rem; + padding-bottom: 0.0625rem; } .bx--col { width: 100%; diff --git a/packages/grid/scss/_mixins.scss b/packages/grid/scss/_mixins.scss index 63fca40944f6..c3e413f7f1df 100644 --- a/packages/grid/scss/_mixins.scss +++ b/packages/grid/scss/_mixins.scss @@ -320,12 +320,9 @@ $carbon--aspect-ratios: ((16, 9), (2, 1), (4, 3), (1, 1), (1, 2)); @include carbon--make-row(); } - .#{$prefix}--grid--condensed .#{$prefix}--row:not(:last-of-type) { - margin-bottom: $condensed-gutter; - } - - .#{$prefix}--row--condensed + .#{$prefix}--row--condensed { - margin-top: $condensed-gutter; + .#{$prefix}--grid--condensed [class*='#{$prefix}--col'] { + padding-top: $condensed-gutter / 2; + padding-bottom: $condensed-gutter / 2; } @include carbon--make-grid-columns($breakpoints, $grid-gutter);