From 56e5cced1fd247df9a1c9be927bf9ea15edd3fdd Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Mon, 25 Jul 2022 15:01:08 +0200
Subject: [PATCH] add sm Grid support
---
assets/sass/_theme/_utils.sass | 9 +++++++--
assets/sass/_theme/blocks/call_to_action.sass | 2 +-
assets/sass/_theme/blocks/definitions.sass | 2 +-
assets/sass/_theme/blocks/files.sass | 4 ++--
assets/sass/_theme/blocks/gallery.sass | 2 +-
assets/sass/_theme/blocks/key_figures.sass | 2 +-
assets/sass/_theme/blocks/pages.sass | 4 ++--
assets/sass/_theme/design-system/nav.sass | 2 +-
assets/sass/_theme/design-system/table.sass | 1 +
assets/sass/_theme/sections/organizations.sass | 4 ++--
assets/sass/_theme/sections/pages.sass | 2 +-
assets/sass/_theme/sections/persons.sass | 2 +-
assets/sass/_theme/sections/posts.sass | 2 +-
assets/sass/_theme/sections/programs.sass | 4 ++--
14 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index d7a1c026..19a749ad 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -73,8 +73,13 @@
padding-left: $grid-gutter
padding-right: $grid-gutter
-@mixin grid($cols: 12, $breakpoint: md)
- @include media-breakpoint-up($breakpoint)
+@mixin grid($cols: 12, $breakpoint: false)
+ @if $breakpoint
+ @include media-breakpoint-up($breakpoint)
+ display: grid
+ grid-gap: 0 $grid-gutter
+ grid-template-columns: repeat($cols, 1fr)
+ @else
display: grid
grid-gap: 0 $grid-gutter
grid-template-columns: repeat($cols, 1fr)
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index a63ef32a..0a206caa 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -54,7 +54,7 @@
order: 1
@include media-breakpoint-up(md)
// @include make-row
- @include grid(2)
+ @include grid(2, md)
align-items: center
> *
// @include make-col-ready
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index 71d967d7..f8a48ff4 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -41,4 +41,4 @@
@include in-page-without-aside
.definitions
- @include grid(2)
\ No newline at end of file
+ @include grid(2, md)
\ No newline at end of file
diff --git a/assets/sass/_theme/blocks/files.sass b/assets/sass/_theme/blocks/files.sass
index 6652f825..faf9292d 100644
--- a/assets/sass/_theme/blocks/files.sass
+++ b/assets/sass/_theme/blocks/files.sass
@@ -2,9 +2,9 @@
ul
@include list-reset
@include in-page-with-aside
- @include grid(2)
+ @include grid(2, md)
@include in-page-without-aside
- @include grid(3)
+ @include grid(3, md)
a
@include icon("download", before)
align-items: center
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index 756fbd78..52d135d7 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -40,7 +40,7 @@
&--grid
.gallery
- @include grid(3)
+ @include grid(3, md)
&--carousel
.container
diff --git a/assets/sass/_theme/blocks/key_figures.sass b/assets/sass/_theme/blocks/key_figures.sass
index a256064f..cf9089d5 100644
--- a/assets/sass/_theme/blocks/key_figures.sass
+++ b/assets/sass/_theme/blocks/key_figures.sass
@@ -1,7 +1,7 @@
.block-key_figures
ul
// --bs-gutter-y: 3rem
- @include grid(3)
+ @include grid(3, md)
list-style: none
padding-left: 0
margin-bottom: 0
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 9075ed75..1e2c888f 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -1,6 +1,6 @@
.block-pages
.pages
- @include grid(2)
+ @include grid(2, md)
.block-pages
.main-page
@@ -45,7 +45,7 @@
padding-top: $grid-gutter
.pages
> *
- @include grid(4)
+ @include grid(4, md)
.page
aspect-ratio: 0.887
background-color: $block-pages-card-page-background
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index c42d628e..430c64d3 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -41,7 +41,7 @@
.nav-level-2
@include media-breakpoint-up(md)
@include container
- @include grid(4)
+ @include grid(4, md)
> li
&,
& > a,
diff --git a/assets/sass/_theme/design-system/table.sass b/assets/sass/_theme/design-system/table.sass
index 6d3bd4a2..31eff655 100644
--- a/assets/sass/_theme/design-system/table.sass
+++ b/assets/sass/_theme/design-system/table.sass
@@ -3,6 +3,7 @@ table
caption-side: bottom
vertical-align: top
width: 100%
+ text-align: left
caption
padding: px2rem(10) 0
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 3c94ab77..8e145f46 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -1,5 +1,5 @@
.organizations
- // @include grid(2) quid mobile
- @include grid(3)
+ @include grid(2)
+ @include grid(3, md)
@include grid(4, lg)
@include grid(6, xl)
diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass
index fb047e48..4c3970e9 100644
--- a/assets/sass/_theme/sections/pages.sass
+++ b/assets/sass/_theme/sections/pages.sass
@@ -28,4 +28,4 @@
text-underline-offset: 3px
.pages
- @include grid(2)
+ @include grid(2, md)
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index 7af3dedb..73340865 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -45,7 +45,7 @@
// @extend .small
.persons
- @include grid(2)
+ @include grid(2, md)
@include grid(3, lg)
.avatar
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 7422681b..71469b1d 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -26,7 +26,7 @@
font-size: px2rem(14)
.posts
- @include grid(2)
+ @include grid(2, md)
@include grid(3, xl)
.post-categories
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 8cfb2176..756a7c61 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -67,7 +67,7 @@
[itemprop="articleBody"]
section
border-top: 1px solid $main-color
- @include grid(12)
+ @include grid(12, md)
@include media-breakpoint-up(md)
position: relative
> *
@@ -75,4 +75,4 @@
h2
@include sticky(calc($header-height + $spacing4))
align-self: start
- grid-column: 1/6
\ No newline at end of file
+ grid-column: 1/6
--
GitLab