Skip to content

[4.0][Cassiopeia] 'Mobile-first' CSS #26237

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

Merged
wilsonge merged 3 commits into from
Sep 10, 2019
Merged

[4.0][Cassiopeia] 'Mobile-first' CSS #26237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bc8643
Cassiopeia 'mobile-first' CSS
ciar4n Sep 9, 2019
9d7695b
fix cascade on modifiers
ciar4n Sep 9, 2019
0bee453
Update _header.scss
ciar4n Sep 9, 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
18 changes: 9 additions & 9 deletions templates/cassiopeia/scss/blocks/_css-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
grid-template-areas:
". head head head head ."
". banner banner banner banner ."
". comp comp comp comp ."
". side-l side-l side-l side-l ."
". side-r side-r side-r side-r ."
". top-a top-a top-a top-a ."
". top-b top-b top-b top-b ."
". side-l comp comp side-r ."
". bot-a bot-a bot-a bot-a ."
". bot-b bot-b bot-b bot-b ."
". footer footer footer footer ."
Expand Down Expand Up @@ -46,15 +48,13 @@
grid-column: full-start / full-end;
}

@include media-breakpoint-down(xs) {
@include media-breakpoint-up(xs) {
grid-template-areas:
". head head head head ."
". banner banner banner banner ."
". comp comp comp comp ."
". side-l side-l side-l side-l ."
". side-r side-r side-r side-r ."
". top-a top-a top-a top-a ."
". top-b top-b top-b top-b ."
". side-l comp comp side-r ."
". bot-a bot-a bot-a bot-a ."
". bot-b bot-b bot-b bot-b ."
". footer footer footer footer ."
Expand Down Expand Up @@ -129,17 +129,17 @@
.container-bottom-b {
display: grid;
grid-gap: $cassiopeia-grid-gutter;
grid-template-columns: repeat(auto-fit, minmax(24%, 1fr));
grid-template-columns: 1fr;

> div {
margin: 0;
}

@include media-breakpoint-down(md) {
@include media-breakpoint-up(sm) {
grid-template-columns: 1fr 1fr;
}

@include media-breakpoint-down(sm) {
grid-template-columns: 1fr;
@include media-breakpoint-up(md) {
grid-template-columns: repeat(auto-fit, minmax(24%, 1fr));
}
}
36 changes: 18 additions & 18 deletions templates/cassiopeia/scss/blocks/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@
}

.mod-menu {
flex-direction: row !important;
flex-direction: column !important;
margin-top: 20px;

@include media-breakpoint-down(md) {
flex-direction: column !important;
margin-top: 20px;
@include media-breakpoint-up(md) {
flex-direction: row !important;
margin-top: 0;

}
}
Expand All @@ -79,20 +80,19 @@
}

&::after {
position: absolute;
right: 50%;
bottom: 0;
left: 50%;
display: block;
height: 2px;
margin: auto;
content: "";
background: transparent;
opacity: .2;
transition: all .2s ease, background-color .2s ease;

@include media-breakpoint-down(md) {
display: none;

@include media-breakpoint-up(md) {
position: absolute;
right: 50%;
bottom: 0;
left: 50%;
display: block;
height: 2px;
margin: auto;
content: "";
background: transparent;
opacity: .2;
transition: all .2s ease, background-color .2s ease;
}
}

Expand Down
9 changes: 5 additions & 4 deletions templates/cassiopeia/scss/blocks/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ header {
.container-sidebar-left,
.container-sidebar-right, {
flex: 0 0 auto;
width: calc(25% - #{$cassiopeia-grid-gutter});
width: calc(100% - #{$cassiopeia-grid-gutter});
order: 1;

> div {
margin-bottom: $cassiopeia-grid-gutter;
Expand All @@ -102,9 +103,9 @@ header {
}
}

@include media-breakpoint-down(sm) {
width: calc(100% - #{$cassiopeia-grid-gutter});
order: 1;
@include media-breakpoint-up(sm) {
width: calc(25% - #{$cassiopeia-grid-gutter});
order: 0;
}
}

Expand Down
132 changes: 63 additions & 69 deletions templates/cassiopeia/scss/blocks/_modifiers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@
}

@supports (display: grid) {
.span-col-2 {
grid-column-end: span 2;
}
.span-col-3 {
grid-column-end: span 3;
}
.span-col-4 {
grid-column-end: span 4;
}
.span-row-2 {
grid-row-end: span 2;
}
.span-row-3 {
grid-row-end: span 3;
}
.span-row-4 {
grid-row-end: span 4;
}
[class^='span-'], [class*=' span-'] {
@include media-breakpoint-down(md) {
grid-column-end: auto;
grid-row-end: auto;
}
grid-column-end: auto;
grid-row-end: auto;
}

[class^='span-col'], [class*=' span-col'] {
@include media-breakpoint-down(md) {
@include media-breakpoint-up(sm) {
grid-column-end: span 2;
}
}

@include media-breakpoint-up(md) {
.span-col-2 {
grid-column-end: span 2;
}
@include media-breakpoint-down(sm) {
grid-column-end: auto;
.span-col-3 {
grid-column-end: span 3;
}
.span-col-4 {
grid-column-end: span 4;
}
.span-row-2 {
grid-row-end: span 2;
}
.span-row-3 {
grid-row-end: span 3;
}
.span-row-4 {
grid-row-end: span 4;
}
}

[class^='container-'], [class*=' container-'] {
[class^='span-'], [class*=' span-'] {
flex: 0 1 auto;
Expand All @@ -65,25 +65,22 @@
margin-bottom: $cassiopeia-grid-gutter;
margin-left: -($cassiopeia-grid-gutter / 2);
padding: 0;
&.columns-2 {
> div {
width: 50%;
}
}
&.columns-3 {
> div {
width: 33.33333%;
width: 100%;

@include media-breakpoint-up(md) {
&.columns-2 {
> div {
width: 50%;
}
}
}
&.columns-4 {
> div {
width: 25%;
&.columns-3 {
> div {
width: 33.33333%;
}
}
}
&[class^='columns-'], &[class*=' columns-'] {
> div {
@include media-breakpoint-down(md) {
width: 100%;
&.columns-4 {
> div {
width: 25%;
}
}
}
Expand All @@ -110,18 +107,16 @@
max-width: none;
}
}
&.columns-2 {
grid-template-columns: 1fr 1fr;
}
&.columns-3 {
grid-template-columns: 1fr 1fr 1fr;
}
&.columns-4 {
grid-template-columns: 1fr 1fr 1fr 1fr;
}
&[class^='columns-'], &[class*=' columns-'] {
@include media-breakpoint-down(md) {
grid-template-columns: 1fr;

@include media-breakpoint-up(md) {
&.columns-2 {
grid-template-columns: 1fr 1fr;
}
&.columns-3 {
grid-template-columns: 1fr 1fr 1fr;
}
&.columns-4 {
grid-template-columns: 1fr 1fr 1fr 1fr;
}
}
}
Expand All @@ -137,18 +132,16 @@
break-inside: avoid;
}
}
&.masonry-2 {
column-count: 2;
}
&.masonry-3 {
column-count: 3;
}
&.masonry-4 {
column-count: 4;
}
&[class^='masonry-'], &[class*=' masonry-'] {
@include media-breakpoint-down(md) {
column-count: 1;

@include media-breakpoint-up(md) {
&.masonry-2 {
column-count: 2;
}
&.masonry-3 {
column-count: 3;
}
&.masonry-4 {
column-count: 4;
}
}
}
Expand Down Expand Up @@ -190,9 +183,10 @@
}
}
.image-left &, .image-right & {
flex-direction: row;
@include media-breakpoint-down(sm) {
flex-direction: column;
flex-direction: column;

@include media-breakpoint-up(sm) {
flex-direction: row;
}
}
}
Expand Down