diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 4ec19813d8c24807f65e8bb19b425043f47f24f6..8f94e1b96dc12719bb0903b82ccfa9bddb72d64f 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -18,13 +18,13 @@ $grid-max-width: pxToRem(1980) !default
// Spacing
$space-unit: 4 !default
-$spacing-1: space(2) !default // 8px
-$spacing-2: space(3) !default // 12px
-$spacing-3: space(6) !default // 24px
-$spacing-4: space(12) !default // 48px
-$spacing-5: space(16) !default // 64px
-$spacing-6: space(32) !default // 128px
-$spacing-7: space(64) !default // 256px
+$spacing-1: space(2) !default // 8px
+$spacing-2: space(3) !default // 12px
+$spacing-3: space(6) !default // 24px
+$spacing-4: space(12) !default // 48px
+$spacing-5: space(16) !default // 64px
+$spacing-6: space(32) !default // 128px
+$spacing-7: space(64) !default // 256px
// Deprecated variables
// $spacing0: space(3) !default
@@ -34,7 +34,6 @@ $spacing-7: space(64) !default // 256px
// $spacing4: space(32) !default
// $spacing5: space(64) !default
-
// TYPOGRAPHY
// Fonts family
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index fcfe8f48c6d14853e12d20c9de0045e888f46575..713f81cc800c272d0c47236a73911730600e07b5 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -63,7 +63,7 @@
opacity: 0.1
&__track
overflow: visible
- margin-right: half(var(--grid-gutter-negative))
+ margin-right: var(--grid-gutter-negative)
@include in-page-with-sidebar
.splide__slide
transition: opacity .3s ease
@@ -72,14 +72,12 @@
opacity: 0.6
&.is-active
opacity: 1
- @include media-breakpoint-up(desktop)
- margin-right: half(var(--grid-gutter-negative))
&__slide
flex-shrink: initial
&:last-child
padding-right: 20%
figure
- margin-right: half(var(--grid-gutter))
+ margin-right: $spacing-3
@include media-breakpoint-down(desktop)
display: flex
flex-direction: column
@@ -123,7 +121,7 @@
.splide
figure
margin-left: var(--grid-gutter)
- margin-right: half(var(--grid-gutter-negative))
+ margin-right: -$spacing-3
&__slide
&:first-child
margin-left: var(--grid-gutter)
diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass
index f50eba9578bc8861c2d60b7bb1ce900ed83761a8..27cfd7b2108857d595aa3a40ebd759cd6dc16cac 100644
--- a/assets/sass/_theme/blocks/image.sass
+++ b/assets/sass/_theme/blocks/image.sass
@@ -30,7 +30,6 @@
figure
img
max-height: $block-image-max-height-without-sidebar
- // max-height: calc(100vh - var(--header-height))
width: auto
max-width: 100%
&.image-portrait, &.image-square
@@ -42,16 +41,15 @@
figure
display: flex
align-items: flex-end
- > a
+ > a
width: columns(7)
- margin-left: half(var(--grid-gutter))
+ margin-left: var(--grid-gutter)
display: block
order: 2
picture
margin-left: 0
- margin-right: var(--grid-gutter-negative)
figcaption
- width: calc(#{columns(5)} + var(--grid-gutter) / 2)
+ width: columns(5)
order: 1
display: block
text-align: right
diff --git a/assets/sass/_theme/blocks/organizations.sass b/assets/sass/_theme/blocks/organizations.sass
index 152194776291e1ec5b1f4a13f07585ec8a315367..b74eb772d95fc20e96e444e9f3f40d46d8dfdd1b 100644
--- a/assets/sass/_theme/blocks/organizations.sass
+++ b/assets/sass/_theme/blocks/organizations.sass
@@ -38,7 +38,6 @@
@include grid(2, md)
@include grid(3, lg)
@include grid(4, xl)
- grid-column-gap: half(var(--grid-gutter))
@include in-page-without-sidebar
.top .description
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index b0af31ffe2426adf6e7edd7875dbd75612c446cd..10de93aadb8529a167c18a88e761c3f1bbcf5b62 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -56,11 +56,9 @@
@include hover-translate-icon(after)
@include media-breakpoint-up(desktop)
.grid
- @include grid(2, desktop)
- @include in-page-with-sidebar
- grid-column-gap: half(var(--grid-gutter)) !important
+ @include grid(2)
@include in-page-without-sidebar
- @include grid(3, desktop)
+ @include grid(3)
&--cards
background-color: $block-pages-card-background
@@ -74,10 +72,8 @@
@include top-flex
.cards
@include grid(2, desktop)
- @include in-page-with-sidebar
- grid-gap: half(var(--grid-gutter)) !important
@include in-page-without-sidebar
- @include grid(3, desktop)
+ @include grid(3)
// TODO: move this //
.block-gallery + &,
.block-pages--cards + &
@@ -171,16 +167,14 @@
// margin-bottom: $spacing-4
ul.title-only
@include grid(2, desktop)
- grid-row-gap: $spacing-2 !important
- grid-column-gap: half(var(--grid-gutter)) !important
li
margin-top: 0
a
@include meta
article
- gap: half(var(--grid-gutter))
+ gap: var(--grid-gutter)
.media
- width: calc(#{columns(2)} + #{half(var(--grid-gutter))})
+ width: columns(2)
.page-content
width: columns(6)
@@ -194,9 +188,9 @@
@include h2
article
.media
- width: columns(4)
+ width: columns(2)
.page-content
- width: columns(8)
+ width: columns(4)
&:not(.with-description)
ul.title-only
@include grid(4, desktop, space(2))
@@ -210,7 +204,6 @@
&.with-description
.block-content
@include grid(12, desktop, $spacing-4)
- row-gap: half(var(--grid-gutter))
.top
align-items: initial
grid-column: 1 / 8