From b7deefcc12d9591b33cc55ca5bcd6da07f27caa2 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Thu, 15 Dec 2022 15:47:29 +0100
Subject: [PATCH] fix grid breakpoint
---
assets/sass/_theme/blocks/definitions.sass | 2 +-
assets/sass/_theme/blocks/files.sass | 4 ++--
assets/sass/_theme/blocks/gallery.sass | 6 +++---
assets/sass/_theme/blocks/key_figures.sass | 6 +++---
assets/sass/_theme/blocks/organization_chart.sass | 2 +-
assets/sass/_theme/blocks/pages.sass | 12 ++++++------
assets/sass/_theme/blocks/posts.sass | 6 +++---
assets/sass/_theme/design-system/footer.sass | 2 +-
assets/sass/_theme/design-system/nav.sass | 2 +-
assets/sass/_theme/design-system/pagination.sass | 1 +
assets/sass/_theme/sections/authors.sass | 2 +-
assets/sass/_theme/sections/diplomas.sass | 4 ++--
assets/sass/_theme/sections/pages.sass | 2 +-
assets/sass/_theme/sections/posts.sass | 14 +++++++-------
assets/sass/_theme/sections/programs.sass | 4 ++--
15 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index 10e1ee2b..9043508e 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -27,6 +27,6 @@
@include media-breakpoint-up(desktop)
@include in-page-without-sidebar
.definitions
- @include grid(2, md)
+ @include grid(2, desktop)
grid-row-gap: 0 !important
diff --git a/assets/sass/_theme/blocks/files.sass b/assets/sass/_theme/blocks/files.sass
index fd199167..65f4c3cf 100644
--- a/assets/sass/_theme/blocks/files.sass
+++ b/assets/sass/_theme/blocks/files.sass
@@ -40,7 +40,7 @@
@include media-breakpoint-up(desktop)
@include in-page-with-sidebar
ul
- @include grid(2, md, half($grid-gutter))
+ @include grid(2, desktop, half($grid-gutter))
@include in-page-without-sidebar
.top
display: flex
@@ -51,4 +51,4 @@
width: col(8)
margin-left: $grid-gutter
ul
- @include grid(3, md, half($grid-gutter))
+ @include grid(3, desktop, half($grid-gutter))
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index fda78c51..fdb26009 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -1,7 +1,7 @@
.block-gallery
@include in-page-without-sidebar
.top
- @include grid(2, md)
+ @include grid(2, desktop)
align-items: baseline
figure
display: block
@@ -34,9 +34,9 @@
.gallery
align-items: baseline
@include in-page-with-sidebar
- @include grid(3, md, half($grid-gutter), half($grid-gutter))
+ @include grid(3, desktop, half($grid-gutter), half($grid-gutter))
@include in-page-without-sidebar
- @include grid(4, md)
+ @include grid(4, desktop)
@include media-breakpoint-down(desktop)
@include grid(2)
grid-gap: half($grid-gutter-sm) !important
diff --git a/assets/sass/_theme/blocks/key_figures.sass b/assets/sass/_theme/blocks/key_figures.sass
index e58a1341..a108b428 100644
--- a/assets/sass/_theme/blocks/key_figures.sass
+++ b/assets/sass/_theme/blocks/key_figures.sass
@@ -2,10 +2,10 @@
.top
margin-bottom: 0
ul
- @include grid(3, md)
+ @include grid(3, desktop)
@include list-reset
@include in-page-with-sidebar
- @include grid(2, md)
+ @include grid(2, desktop)
.top + ul
margin-top: $spacing2
@include media-breakpoint-down(desktop)
@@ -25,7 +25,7 @@
display: inline-block
font-size: $block-key_figures-number-font-size
margin-inline-end: 0.1em
- @include media-breakpoint-up(desktop)
+ @include media-breakpoint-up(md)
font-size: $block-key_figures-font-size-desktop
strong
font-size: $block-key_figures-number-font-size-desktop
diff --git a/assets/sass/_theme/blocks/organization_chart.sass b/assets/sass/_theme/blocks/organization_chart.sass
index ceeb14df..e93f064e 100644
--- a/assets/sass/_theme/blocks/organization_chart.sass
+++ b/assets/sass/_theme/blocks/organization_chart.sass
@@ -13,7 +13,7 @@
@include media-breakpoint-up(desktop)
@include in-page-with-sidebar
.persons
- @include grid(1, md)
+ @include grid(1, desktop)
@include grid(2, xxl)
article
flex-direction: row
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index e6a38d31..3e8d2515 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -60,11 +60,11 @@
@include hover-translate-icon(after, 3)
@include media-breakpoint-up(desktop)
.grid
- @include grid(2, md)
+ @include grid(2, desktop)
@include in-page-with-sidebar
grid-column-gap: half($grid-gutter) !important
@include in-page-without-sidebar
- @include grid(3, md)
+ @include grid(3, desktop)
&--cards
background-color: $block-pages-card-background
@@ -73,11 +73,11 @@
.blocks &:last-of-type
margin-bottom: 0
.cards
- @include grid(2, md)
+ @include grid(2, desktop)
@include in-page-with-sidebar
grid-gap: half($grid-gutter) !important
@include in-page-without-sidebar
- @include grid(3, md)
+ @include grid(3, desktop)
// TODO: move this //
.block-gallery + &,
.block-pages--cards + &
@@ -148,7 +148,7 @@
.description
margin-bottom: $spacing1
ul
- @include grid(2, md)
+ @include grid(2, desktop)
grid-row-gap: $spacing0 !important
grid-column-gap: half($grid-gutter) !important
li
@@ -166,7 +166,7 @@
grid-row: 2 / 3
// Default behavior (without page description)
ul
- @include grid(4, md)
+ @include grid(4, desktop)
grid-column: 1 / 13
li
margin-top: 0
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index 30569ff5..46afc430 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -6,7 +6,7 @@
text-decoration: none
.posts
@include grid(1)
- @include grid($block-posts-grid-columns, md)
+ @include grid($block-posts-grid-columns, desktop)
article
h1
a
@@ -24,7 +24,7 @@
@include media-breakpoint-up(desktop)
@include in-page-with-sidebar
.grid
- @include grid(2, md, $grid-gutter, half($grid-gutter))
+ @include grid(2, desktop, $grid-gutter, half($grid-gutter))
@include in-page-without-sidebar
.grid
@include grid($block-posts-grid-columns)
@@ -146,7 +146,7 @@
margin-left: half($grid-gutter)
.list
article
- @include grid(8, md, 0, 0)
+ @include grid(8, desktop, 0, 0)
h1
grid-column: 1 / 7
time
diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass
index f755af28..73b09a98 100644
--- a/assets/sass/_theme/design-system/footer.sass
+++ b/assets/sass/_theme/design-system/footer.sass
@@ -34,7 +34,7 @@ footer[role="contentinfo"]
margin-top: $spacing3
@include media-breakpoint-up(desktop)
.container
- @include grid(2, md, $spacing4)
+ @include grid(2, desktop, $spacing4)
.footer
&-site, &-social
text-align: right
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index 881223fe..b692a233 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -97,7 +97,7 @@
padding-right: 0
.nav-level-2
@include container
- @include grid(4, md)
+ @include grid(4, desktop)
@else
.has-children
position: relative
diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass
index 6210ee77..f675dedd 100644
--- a/assets/sass/_theme/design-system/pagination.sass
+++ b/assets/sass/_theme/design-system/pagination.sass
@@ -4,6 +4,7 @@
justify-content: center
align-items: center
display: flex
+ flex-wrap: wrap
margin-top: $spacing3
margin-bottom: $spacing4
li
diff --git a/assets/sass/_theme/sections/authors.sass b/assets/sass/_theme/sections/authors.sass
index f8eb3f2d..58c1849d 100644
--- a/assets/sass/_theme/sections/authors.sass
+++ b/assets/sass/_theme/sections/authors.sass
@@ -2,4 +2,4 @@
.container
margin-top: $spacing2
.posts
- @include grid(3, md)
+ @include grid(3, desktop)
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index f8f6a3d5..9cb90068 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -30,7 +30,7 @@ ul.diplomas
margin-left: $spacing1
.content
- @include grid(2, md)
+ @include grid(2, desktop)
padding-bottom: $spacing1
padding-top: $spacing1
@@ -130,5 +130,5 @@ ul.diplomas
.diplomas__term
ol.programs
li
- @include grid(2, md)
+ @include grid(2, desktop)
align-items: start
\ No newline at end of file
diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass
index 68572d94..580c991a 100644
--- a/assets/sass/_theme/sections/pages.sass
+++ b/assets/sass/_theme/sections/pages.sass
@@ -7,7 +7,7 @@
.pages
@include grid(1)
- @include grid(3, md)
+ @include grid(3, desktop)
.page__children
margin-top: $spacing3
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 4e40d871..cd487357 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -8,17 +8,17 @@
.categories__term,
.persons__page
@if $posts-layout-list
- .posts
- @include grid(1)
- grid-gap: 0
+ .posts
article
border-bottom: 1px solid $color-border
- margin-bottom: $spacing3
- padding-bottom: $spacing3
display: flex
+ margin-bottom: $spacing1
+ padding-bottom: $spacing1
flex-direction: row
@include media-breakpoint-up(desktop)
@include grid
+ margin-bottom: $spacing3
+ padding-bottom: $spacing3
div:not(.media)
grid-column: 4/13
@include media-breakpoint-down(desktop)
@@ -49,7 +49,7 @@
@else
.posts
@include grid(1)
- @include grid(2, md)
+ @include grid(2, desktop)
@include grid($posts-grid-columns, xxl)
.categories__term
@@ -149,7 +149,7 @@
.related
margin-top: $spacing1
.posts
- @include grid(2, md)
+ @include grid(2, desktop)
margin-bottom: 0
.link
@extend .link-more
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 31d92b47..80412aa6 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -3,7 +3,7 @@
div.programs,
section.programs
- @include grid(2, md)
+ @include grid(2, desktop)
@include grid(3, xl)
ol.programs
@@ -95,7 +95,7 @@ ol.programs
@include media-breakpoint-up(desktop)
.document-content
.content
- @include grid(12, md)
+ @include grid(12, desktop)
position: relative
padding-bottom: $spacing4
> *
--
GitLab