From 5af6c8c016fd6f19cc5c18d9381b88d93b3e2be6 Mon Sep 17 00:00:00 2001
From: Marie Comet <mcomet@beapi.fr>
Date: Thu, 8 Aug 2024 10:24:05 +0200
Subject: [PATCH 1/2] harmonize gap rules, fix CSS for Grid block

---
 src/scss/03-base/_variables-css.scss  | 1 +
 src/scss/06-blocks/_gutenberg.scss    | 7 ++++++-
 src/scss/06-blocks/core/_columns.scss | 1 -
 src/scss/06-blocks/core/_gallery.scss | 6 +++---
 src/scss/06-blocks/core/_group.scss   | 8 ++++++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/scss/03-base/_variables-css.scss b/src/scss/03-base/_variables-css.scss
index 61114338..0b884418 100644
--- a/src/scss/03-base/_variables-css.scss
+++ b/src/scss/03-base/_variables-css.scss
@@ -36,6 +36,7 @@
     /*
      * Spacing
      */
+    --spacing--block-default: 16px;
     --spacing--block-1: 16px;
     --spacing--block-2: 32px;
     --spacing--block-3: 48px;
diff --git a/src/scss/06-blocks/_gutenberg.scss b/src/scss/06-blocks/_gutenberg.scss
index e4b2e980..47f5fcc6 100644
--- a/src/scss/06-blocks/_gutenberg.scss
+++ b/src/scss/06-blocks/_gutenberg.scss
@@ -102,11 +102,16 @@
         margin-bottom: var(--spacing--block-1);
     }
 
+    :where(.is-layout-flex),
+    :where(.is-layout-grid) {
+        gap: get-gutter-width();
+    }
+
     // ----
     // Alignements verticaux
     // ----
     > *,
-    [class*="inner-container"] > * {
+    [class*="inner-container"]:not(.is-layout-grid) > * {
         margin-top: var(--spacing--block-1);
         margin-bottom: var(--spacing--block-1);
 
diff --git a/src/scss/06-blocks/core/_columns.scss b/src/scss/06-blocks/core/_columns.scss
index 1e385540..a7688a56 100644
--- a/src/scss/06-blocks/core/_columns.scss
+++ b/src/scss/06-blocks/core/_columns.scss
@@ -1,6 +1,5 @@
 .wp-block-columns {
     @include block-vertical-spacing();
-    gap: get-gutter-width() !important;
 
     .wp-block-column {
         &.has-background {
diff --git a/src/scss/06-blocks/core/_gallery.scss b/src/scss/06-blocks/core/_gallery.scss
index 4a7aef6b..75a7afaa 100644
--- a/src/scss/06-blocks/core/_gallery.scss
+++ b/src/scss/06-blocks/core/_gallery.scss
@@ -1,3 +1,3 @@
-// .wp-block-gallery {
-//     ...
-// }
+.wp-block-gallery {
+    --wp--style--gallery-gap-default: #{get-gutter-width()} !important;
+}
diff --git a/src/scss/06-blocks/core/_group.scss b/src/scss/06-blocks/core/_group.scss
index 6bc10536..03878e2c 100644
--- a/src/scss/06-blocks/core/_group.scss
+++ b/src/scss/06-blocks/core/_group.scss
@@ -1,7 +1,9 @@
 .wp-block-group {
     $el: &;
 
-    display: flow-root;
+    &:not(.is-layout-grid) {
+        display: flow-root;
+    }
 
     &--no-inner-margin {
         #{$el}__inner-container {
@@ -21,7 +23,9 @@
 
 @include editor-only {
     .wp-block-group {
-        display: flow-root;
+        &:not(.is-layout-grid) {
+            display: flow-root;
+        }
 
         .wp-block-group.has-background > .block-editor-block-list__layout > [data-align="full"] {
             width: 100%;

From f60311404835529b183e1eb51d1f0cf35fa6c080 Mon Sep 17 00:00:00 2001
From: Marie Comet <mcomet@beapi.fr>
Date: Thu, 8 Aug 2024 10:25:28 +0200
Subject: [PATCH 2/2] remove spacing default from CSS variables

---
 src/scss/03-base/_variables-css.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/scss/03-base/_variables-css.scss b/src/scss/03-base/_variables-css.scss
index 0b884418..61114338 100644
--- a/src/scss/03-base/_variables-css.scss
+++ b/src/scss/03-base/_variables-css.scss
@@ -36,7 +36,6 @@
     /*
      * Spacing
      */
-    --spacing--block-default: 16px;
     --spacing--block-1: 16px;
     --spacing--block-2: 32px;
     --spacing--block-3: 48px;