Skip to content

Commit 0378f5c

Browse files
committed
Add new grid layout for sidebar columns
1 parent c50bc85 commit 0378f5c

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

app/javascript/css/layout.scss

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ main > *,
2424
.footer-content,
2525
.main-content,
2626
.grid-content,
27-
.article-content {
27+
.article-content,
28+
.column-content {
2829
display: grid;
2930
}
3031

@@ -48,7 +49,8 @@ main > *,
4849

4950
.main-content,
5051
.article-content,
51-
.grid-content {
52+
.grid-content,
53+
.column-content {
5254
grid-gap: var(--grid-gutter);
5355
grid-template-columns: repeat(var(--grid-columns), [col-start] 1fr);
5456
grid-template-rows: minmax(calc(var(--leading) * 1em), max-content);
@@ -58,7 +60,8 @@ main > *,
5860
.section-content,
5961
.article-content,
6062
.grid-content,
61-
.grid-row-mid {
63+
.grid-row-mid,
64+
.column-content {
6265
grid-auto-flow: row;
6366
row-gap: var(--space-m);
6467
}
@@ -84,14 +87,19 @@ main > *,
8487

8588
.main-content > *,
8689
.article-content > *,
87-
.grid-content > * {
90+
.grid-content > *,
91+
.column-content > * {
8892
grid-column: col-start 1 / span var(--grid-columns);
8993
}
9094

9195
.row-gap-m {
9296
row-gap: var(--space-m);
9397
}
9498

99+
.row-gap-none {
100+
row-gap: 0;
101+
}
102+
95103
.col-gap-m {
96104
column-gap: var(--space-m);
97105
}
@@ -123,6 +131,14 @@ main > *,
123131
}
124132
}
125133

134+
.column-content > .sidebar {
135+
grid-column: col-start 1 / span 3;
136+
}
137+
138+
.column-content > .mainbar {
139+
grid-column: col-start 4 / span 9;
140+
}
141+
126142
// For making blocks span the full width of the article
127143
.article-content > .stretch {
128144
grid-column: col-start / span var(--grid-columns);

0 commit comments

Comments
 (0)