Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Grid gutter #104

Merged
merged 2 commits into from
Dec 5, 2019
Merged

fix: Grid gutter #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
735d945
Fix Grid gutter widths
tassoevan Dec 5, 2019
a9c9530
Add vertical gutter
tassoevan Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Default_Story.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Lg_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Md_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Sm_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xl_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Containers_Grid_Xs_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Default_Story.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Lg_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Md_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Sm_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xl_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Containers_Grid_Xs_Breakpoint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 45 additions & 60 deletions packages/fuselage/src/components/Grid/stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,105 +43,90 @@ import { Grid, Tile } from '../..';
### Extra Small (xs)

<Story name='xs breakpoint'>
<>
<Grid>
{Array.from({ length: breakpoints.xs.columns }).map((_, i) => i + 1).map((columns) =>
<React.Fragment key={columns}>
<Grid>
<Grid.Item xs={columns}>
<Tile elevation={1} style={{ padding: 16 }}>xs={columns}</Tile>
</Grid.Item>
{(breakpoints.xs.columns - columns > 0) &&
<Grid.Item xs={breakpoints.xs.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>xs={breakpoints.xs.columns - columns}</Tile>
</Grid.Item>}
</Grid>
<br />
<Grid.Item xs={columns}>
<Tile elevation={1} style={{ padding: 16 }}>xs={columns}</Tile>
</Grid.Item>
{(breakpoints.xs.columns - columns > 0) &&
<Grid.Item xs={breakpoints.xs.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>xs={breakpoints.xs.columns - columns}</Tile>
</Grid.Item>}
</React.Fragment>
)}
</>
</Grid>
</Story>

### Small (sm)

<Story name='sm breakpoint'>
<>
<Grid>
{Array.from({ length: breakpoints.sm.columns }).map((_, i) => i + 1).map((columns) =>
<React.Fragment key={columns}>
<Grid>
<Grid.Item sm={columns}>
<Tile elevation={1} style={{ padding: 16 }}>sm={columns}</Tile>
</Grid.Item>
{(breakpoints.sm.columns - columns > 0) &&
<Grid.Item sm={breakpoints.sm.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>sm={breakpoints.sm.columns - columns}</Tile>
</Grid.Item>}
</Grid>
<br />
<Grid.Item sm={columns}>
<Tile elevation={1} style={{ padding: 16 }}>sm={columns}</Tile>
</Grid.Item>
{(breakpoints.sm.columns - columns > 0) &&
<Grid.Item sm={breakpoints.sm.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>sm={breakpoints.sm.columns - columns}</Tile>
</Grid.Item>}
</React.Fragment>
)}
</>
</Grid>
</Story>

### Medium (md)

<Story name='md breakpoint'>
<>
<Grid>
{Array.from({ length: breakpoints.md.columns }).map((_, i) => i + 1).map((columns) =>
<React.Fragment key={columns}>
<Grid>
<Grid.Item md={columns}>
<Tile elevation={1} style={{ padding: 16 }}>md={columns}</Tile>
</Grid.Item>
{(breakpoints.md.columns - columns > 0) &&
<Grid.Item md={breakpoints.md.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>md={breakpoints.md.columns - columns}</Tile>
</Grid.Item>}
</Grid>
<br />
<Grid.Item md={columns}>
<Tile elevation={1} style={{ padding: 16 }}>md={columns}</Tile>
</Grid.Item>
{(breakpoints.md.columns - columns > 0) &&
<Grid.Item md={breakpoints.md.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>md={breakpoints.md.columns - columns}</Tile>
</Grid.Item>}
</React.Fragment>
)}
</>
</Grid>
</Story>

### Large (lg)

<Story name='lg breakpoint'>
<>
<Grid>
{Array.from({ length: breakpoints.lg.columns }).map((_, i) => i + 1).map((columns) =>
<React.Fragment key={columns}>
<Grid>
<Grid.Item lg={columns}>
<Tile elevation={1} style={{ padding: 16 }}>lg={columns}</Tile>
</Grid.Item>
{(breakpoints.lg.columns - columns > 0) &&
<Grid.Item lg={breakpoints.lg.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>lg={breakpoints.lg.columns - columns}</Tile>
</Grid.Item>}
</Grid>
<br />
<Grid.Item lg={columns}>
<Tile elevation={1} style={{ padding: 16 }}>lg={columns}</Tile>
</Grid.Item>
{(breakpoints.lg.columns - columns > 0) &&
<Grid.Item lg={breakpoints.lg.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>lg={breakpoints.lg.columns - columns}</Tile>
</Grid.Item>}
</React.Fragment>
)}
</>
</Grid>
</Story>

### Extra Large (xl)

<Story name='xl breakpoint'>
<>
<Grid>
{Array.from({ length: breakpoints.xl.columns }).map((_, i) => i + 1).map((columns) =>
<React.Fragment key={columns}>
<Grid>
<Grid.Item xl={columns}>
<Tile elevation={1} style={{ padding: 16 }}>xl={columns}</Tile>
</Grid.Item>
{(breakpoints.xl.columns - columns > 0) &&
<Grid.Item xl={breakpoints.xl.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>xl={breakpoints.xl.columns - columns}</Tile>
</Grid.Item>}
</Grid>
<br />
<Grid.Item xl={columns}>
<Tile elevation={1} style={{ padding: 16 }}>xl={columns}</Tile>
</Grid.Item>
{(breakpoints.xl.columns - columns > 0) &&
<Grid.Item xl={breakpoints.xl.columns - columns}>
<Tile elevation={1} style={{ padding: 16 }}>xl={breakpoints.xl.columns - columns}</Tile>
</Grid.Item>}
</React.Fragment>
)}
</>
</Grid>
</Story>

6 changes: 4 additions & 2 deletions packages/fuselage/src/components/Grid/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand All @@ -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 {
Expand Down