Merge pull request #393 from 202ecommerce/bugfix/49483-prestashop_edi…

…tion_conflict refs #49483 - Fix BO styles for prestashop edition
202ecommerce · Jan 29, 2025 · 527e0bd · 527e0bd
2 parents 6f41749 + 5596fe9
commit 527e0bd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -77,7 +77,7 @@ jobs:
 
           # Set php version to avoid error during perform command composer update
             - name: Setup PHP
-              uses: nanasess/setup-php@v3
+              uses: nanasess/setup-php@v4.1.0
               with:
                 php-version: '7.3'
 

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -14,7 +14,7 @@ jobs:
 
             # Set php version to avoid error during perform command composer update
             - name: Setup PHP
-              uses: nanasess/setup-php@v3
+              uses: nanasess/setup-php@v4.1.0
               with:
                 php-version: '7.3'
 

diff --git a/202/_dev/js/admin.js b/202/_dev/js/admin.js
@@ -57,4 +57,10 @@ window.addEventListener('load', () => {
       ))
     );
   }
+
+  document.getElementById('main').classList.add('loaded');
+});
+
+$(() => {
+  document.body.classList.add("no-smb-reskin");
 });
diff --git a/202/_dev/scss/admin/abstract/_variables.scss b/202/_dev/scss/admin/abstract/_variables.scss
@@ -135,6 +135,8 @@ $color-swatch-height: $color-swatch-width !default;
 
 // Modals
 $modal-lg: 1125px !default;
+$zindex-modal-backdrop:             1090 !default;
+$zindex-modal:                      1091 !default;
 
 // Badges
 $badge-font-size: 13px !default;

diff --git a/202/_dev/scss/pages/_admin.scss b/202/_dev/scss/pages/_admin.scss
@@ -27,3 +27,23 @@
 #messaging-configurator div  {
   box-sizing: initial;
 }
+
+body:not(.ps-bo-rebrand) {
+  background: $body-bg !important;
+
+  #main {
+    background: transparent;
+
+    &:not(.loaded) {
+      &::before {
+        content: '';
+        width: 100vw;
+        height: 100vh;
+        position: fixed;
+        top: 0;
+        z-index: 1;
+        background: $body-bg;
+      }
+    }
+  }
+}