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

Fixed margins on the nested fluid grid. #312

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Fixed margins on the nested fluid grid. #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions components/00-base/grid/grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

// Container class should wrap every row.
.container {
@include ct-container();
&,
& .container-fluid {
@include ct-container();
}
}

.container-fluid {
Expand All @@ -16,8 +19,6 @@
.row {
$root: &;

@include ct-row($ct-grid-gutters);

&#{$root}--reverse {
flex-direction: row-reverse;
}
Expand Down
115 changes: 112 additions & 3 deletions components/00-base/grid/grid.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default {
title: 'Base/Grid',
parameters: {
layout: 'fullscreen',
docs: '<div class="grid-story-docs story-grid-outlines row row--no-grow"><strong>Outline colors: </strong><span class="col grid-story-docs-color-container-contained">Contained container</span><span class="col grid-story-docs-color-container-fluid">Fluid container</span><span class="col grid-story-docs-color-row">Row</span><span class="col grid-story-docs-color-template-column">Template column</span><span class="col grid-story-docs-color-auto-column">Auto column</span><span class="col grid-story-docs-color-placeholder">Placeholder</span></div>',
docs: '<div class="grid-story-docs story-grid-outlines row row--no-grow"><strong>Outline colors: </strong><br/><span class="col grid-story-docs-color-container-contained">Contained container</span><span class="col grid-story-docs-color-container-fluid">Fluid container</span><span class="col grid-story-docs-color-row">Row</span><span class="col grid-story-docs-color-template-column">Template column</span><span class="col grid-story-docs-color-auto-column">Auto column</span><span class="col grid-story-docs-color-placeholder">Placeholder</span></div>',
docsClass: 'story-docs--conditional',
},
};
Expand Down Expand Up @@ -135,7 +135,7 @@ export const Grid = () => {
placeholder('Nested'),
placeholder('Nested'),
],
use_container: false,
use_container: true,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
Expand All @@ -154,14 +154,123 @@ export const Grid = () => {
placeholder('Nested'),
placeholder('Nested'),
],
use_container: false,
use_container: true,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
],
column_attributes: 'data-story-total-columns="2"',
});

html += `<div class="story-container__subtitle">Template column container in container ${code('.container .container > .row > .col-[breakpoint]-[column]')}</div>`;
cols = ['A', 'B', 'C', 'D'];
html += CivicThemeGrid({
items: [
CivicThemeGrid({
items: [
placeholder('Nested'),
placeholder('Nested'),
placeholder('Nested'),
],
use_container: true,
is_fluid: false,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
],
use_container: true,
is_fluid: false,
template_column_count: 2,
column_attributes: 'data-story-total-columns="2"',
});

html += `<div class="story-container__subtitle">Template column fluid container in container ${code('.container .container-fluid > .row > .col-[breakpoint]-[column]')}</div>`;
cols = ['A', 'B', 'C', 'D'];
html += CivicThemeGrid({
items: [
CivicThemeGrid({
items: [
placeholder('Nested'),
placeholder('Nested'),
placeholder('Nested'),
],
use_container: true,
is_fluid: true,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
],
use_container: true,
is_fluid: false,
template_column_count: 2,
column_attributes: 'data-story-total-columns="2"',
});

html += `<div class="story-container__subtitle">Template column container in fluid container ${code('.container-fluid .container > .row > .col-[breakpoint]-[column]')}</div>`;
cols = ['A', 'B', 'C', 'D'];
html += CivicThemeGrid({
items: [
CivicThemeGrid({
items: [
placeholder('Nested'),
placeholder('Nested'),
placeholder('Nested'),
],
use_container: true,
is_fluid: false,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
],
use_container: true,
is_fluid: true,
template_column_count: 2,
column_attributes: 'data-story-total-columns="2"',
});

html += `<div class="story-container__subtitle">Template column container in fluid container (all columns) ${code('.container-fluid .container > .row > .col-[breakpoint]-[column]')}</div>`;
cols = ['A', 'B', 'C', 'D'];
html += CivicThemeGrid({
items: [
CivicThemeGrid({
items: [
placeholder('Nested'),
placeholder('Nested'),
placeholder('Nested'),
],
use_container: true,
is_fluid: false,
column_attributes: 'data-story-total-columns="3"',
}),
],
use_container: true,
is_fluid: true,
template_column_count: 1,
column_attributes: 'data-story-total-columns="1"',
});

html += `<div class="story-container__subtitle">Template column fluid container in fluid container ${code('.container-fluid .container-fluid > .row > .col-[breakpoint]-[column]')}</div>`;
cols = ['A', 'B', 'C', 'D'];
html += CivicThemeGrid({
items: [
CivicThemeGrid({
items: [
placeholder('Nested'),
placeholder('Nested'),
placeholder('Nested'),
],
use_container: true,
is_fluid: true,
column_attributes: 'data-story-total-columns="3"',
}),
placeholder('Parent'),
],
use_container: true,
is_fluid: true,
template_column_count: 2,
column_attributes: 'data-story-total-columns="2"',
});

html += `<div class="story-container__title">Row utilities</div>`;

html += `<div class="story-container__subtitle">Reversed columns ${code('.row.row--reverse')}</div>`;
Expand Down
18 changes: 9 additions & 9 deletions components/00-base/mixins/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,16 @@
max-width: map.get($ct-breakpoints, $bp) - (map.get($ct-grid-offsets, $bp) * 2);
}
}

> .row {
@include ct-row($ct-grid-gutters);
}
}
@else {
width: 100%;

// Reset negative row margins which are used to offset column margins.
.row {
@each $bp, $value in $ct-breakpoints {
@include ct-breakpoint($bp) {
margin-left: auto;
margin-right: auto;
}
}
> .row {
@include ct-row(false);
}
}
}
Expand All @@ -58,7 +56,9 @@
padding-inline-start: 0;
list-style: none;

@include _ct-print-all-gutters($rule-prefix: margin);
@if $gutters != false {
@include _ct-print-all-gutters($rule-prefix: margin);
}
}

@mixin ct-flex-align-right() {
Expand Down