Merge branch '4.4' into 4.5

ibexa · Jun 13, 2023 · 5db40a0 · 5db40a0
2 parents b82b5ae + 6c79e92
commit 5db40a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/bundle/Resources/public/scss/_edit-header.scss b/src/bundle/Resources/public/scss/_edit-header.scss
@@ -8,6 +8,7 @@
     border-top-left-radius: $ibexa-border-radius;
     border-top-right-radius: $ibexa-border-radius;
     transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, border-bottom-width 0;
+    z-index: 2;
 
     &__container {
         display: flex;

diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss
@@ -1,4 +1,6 @@
 .ibexa-main-container {
+    $edit-container-padding: calculateRem(16px);
+
     display: flex;
     flex-wrap: nowrap;
     overflow: hidden;
@@ -15,9 +17,19 @@
 
     &--edit-container {
         height: 100vh;
-        padding: calculateRem(16px);
+        padding: $edit-container-padding;
         background-color: $ibexa-color-dark;
 
+        &::before {
+            content: '';
+            height: $edit-container-padding;
+            position: absolute;
+            top: 0;
+            width: 100%;
+            background-color: $ibexa-color-dark;
+            z-index: 2;
+        }
+
         .ibexa-main-container {
             &__side-column {
                 min-width: calculateRem(240px);