diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass index d7a1c026232f5f4abdc0b10cded36f53d1d5d4bf..19a749adbb78abcf046f7b4d0328d403c8d1f134 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 a63ef32a4f26c0f40488f903fa737d2e00de14aa..0a206caad5e2dfce52d1f9f07d96b5496f6bc058 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 71d967d79587628a965c7dc30c3207a5e0dcc955..f8a48ff4fcf702518593c9a1defa00032ec2b3be 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 6652f8254235ccb6c669c3bc0f84e47a8292e098..faf9292d1c366ad50dd42a7a380392d9723bfe34 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 756fbd780d9e38f8bb34702be038e7ec45f5c199..52d135d73e81bf14ab12c793a2ae4003cc34b151 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 a256064f430e15fae8e977196e88f67155b0090c..cf9089d5f959ca18a7972ceefa923d66f0c6de8e 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 9075ed75626373f99c9989d51bd6f4e2778b7e9b..1e2c888f80310b038559ac19ea83bcd3f7557abe 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 c42d628e6f0246f919c17358b154bc73293471a1..430c64d3427c9cbe297cf9bbb3f495caea0e1bd3 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 6d3bd4a27a54f31e0884419c2967c85f2b70f432..31eff6550cc2e82d0659011c140b86fd11d6966e 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 3c94ab7766eba70dc96ee695aa8884b13a1ab069..8e145f46904e10c09e3f31e62e819a9b53b0b936 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 fb047e48767ccf5e6bf5db70572be88787e3e89e..4c3970e94ac82f85c33e08207f2103e1d7d64931 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 7af3dedbd4e6933defa718379e8b4dcca8b93ae8..733408654366b79087b789d6936fc8e79591eda6 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 7422681b6ae3d96d8c448acfc51263deee08434d..71469b1dd46e4a6ffbf290485c870a04564cd699 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 8cfb2176d9b2e00f04536dea5dcd72e844e892f4..756a7c6116c5cad4ae5c0466f787d4d049e6a71c 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