Skip to content

Commit

Permalink
fix(grid): moved vertical spacing to col (#4960)
Browse files Browse the repository at this point in the history
* fix(condensed-grid): moved vertical spacing to col

* chore(grid): updating snapshot

Co-authored-by: Alessandra Davila <adavila91@gmail.com>
Co-authored-by: Josh Black <josh@josh.black>
  • Loading branch information
3 people committed Jan 10, 2020
1 parent 472bb65 commit b02d19e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down
9 changes: 3 additions & 6 deletions packages/grid/scss/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b02d19e

Please sign in to comment.