diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Default_Story.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Default_Story.png index 230e4983e9..26811fe268 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Default_Story.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Default_Story.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Lg_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Lg_Breakpoint.png index 4e15f751d9..c3c1cb5912 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Lg_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Lg_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Md_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Md_Breakpoint.png index 5e6b8bfed6..40f94736f1 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Md_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Md_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Sm_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Sm_Breakpoint.png index 4c12e1cc53..7175334ce5 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Sm_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Sm_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xl_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xl_Breakpoint.png index be05178948..ab8c7b8a0f 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xl_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xl_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xs_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xs_Breakpoint.png index 1c448c4863..939a6b0e68 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xs_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xs_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Default_Story.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Default_Story.png index 7c858ce000..c55a9b1a78 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Default_Story.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Default_Story.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Lg_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Lg_Breakpoint.png index 9297d385d2..4059f9c851 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Lg_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Lg_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Md_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Md_Breakpoint.png index 1641a16dfb..dda9b1db48 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Md_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Md_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Sm_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Sm_Breakpoint.png index f63e480792..e53ff033cb 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Sm_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Sm_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xl_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xl_Breakpoint.png index 61418e28e0..6b4e0f3f90 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xl_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xl_Breakpoint.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xs_Breakpoint.png b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xs_Breakpoint.png index aef31e6946..0d9b772450 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xs_Breakpoint.png and b/packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xs_Breakpoint.png differ diff --git a/packages/fuselage/src/components/Grid/stories.mdx b/packages/fuselage/src/components/Grid/stories.mdx index 6573c75e42..195803a2ec 100644 --- a/packages/fuselage/src/components/Grid/stories.mdx +++ b/packages/fuselage/src/components/Grid/stories.mdx @@ -43,105 +43,90 @@ import { Grid, Tile } from '../..'; ### Extra Small (xs) - <> + {Array.from({ length: breakpoints.xs.columns }).map((_, i) => i + 1).map((columns) => - - - xs={columns} - - {(breakpoints.xs.columns - columns > 0) && - - xs={breakpoints.xs.columns - columns} - } - -
+ + xs={columns} + + {(breakpoints.xs.columns - columns > 0) && + + xs={breakpoints.xs.columns - columns} + }
)} - +
### Small (sm) - <> + {Array.from({ length: breakpoints.sm.columns }).map((_, i) => i + 1).map((columns) => - - - sm={columns} - - {(breakpoints.sm.columns - columns > 0) && - - sm={breakpoints.sm.columns - columns} - } - -
+ + sm={columns} + + {(breakpoints.sm.columns - columns > 0) && + + sm={breakpoints.sm.columns - columns} + }
)} - +
### Medium (md) - <> + {Array.from({ length: breakpoints.md.columns }).map((_, i) => i + 1).map((columns) => - - - md={columns} - - {(breakpoints.md.columns - columns > 0) && - - md={breakpoints.md.columns - columns} - } - -
+ + md={columns} + + {(breakpoints.md.columns - columns > 0) && + + md={breakpoints.md.columns - columns} + }
)} - +
### Large (lg) - <> + {Array.from({ length: breakpoints.lg.columns }).map((_, i) => i + 1).map((columns) => - - - lg={columns} - - {(breakpoints.lg.columns - columns > 0) && - - lg={breakpoints.lg.columns - columns} - } - -
+ + lg={columns} + + {(breakpoints.lg.columns - columns > 0) && + + lg={breakpoints.lg.columns - columns} + }
)} - +
### Extra Large (xl) - <> + {Array.from({ length: breakpoints.xl.columns }).map((_, i) => i + 1).map((columns) => - - - xl={columns} - - {(breakpoints.xl.columns - columns > 0) && - - xl={breakpoints.xl.columns - columns} - } - -
+ + xl={columns} + + {(breakpoints.xl.columns - columns > 0) && + + xl={breakpoints.xl.columns - columns} + }
)} - +
diff --git a/packages/fuselage/src/components/Grid/styles.scss b/packages/fuselage/src/components/Grid/styles.scss index 6436c74aed..538d52af48 100644 --- a/packages/fuselage/src/components/Grid/styles.scss +++ b/packages/fuselage/src/components/Grid/styles.scss @@ -17,7 +17,8 @@ $breakpoint-names: map-keys($breakpoints); @each $breakpoint-name in $breakpoint-names { @include when-item-is-on-breakpoint($breakpoint-name) { - margin-inline: calc(-1 * #{ to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)) }); + margin-block: calc(#{ to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)) } / -2); + margin-inline: calc(#{ to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)) } / -2); } } } @@ -28,7 +29,8 @@ $breakpoint-names: map-keys($breakpoints); @each $breakpoint-name in $breakpoint-names { @include when-item-is-on-breakpoint($breakpoint-name) { - padding-inline: to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)); + padding-block: calc(#{ to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)) } / 2); + padding-inline: calc(#{ to-rem(map-get(map-get($breakpoints, $breakpoint-name), gutter-width)) } / 2); $total-columns: map-get(map-get($breakpoints, $breakpoint-name), columns); @for $columns from 1 through $total-columns {