Merge pull request #1026 from tblivet/fix/scroll_issue

[NEW UI] Fix scroll issue
PrestaShop · Nov 22, 2024 · 4be38a1 · 4be38a1
2 parents 25cf2f1 + 2fe5153
commit 4be38a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/_dev/src/scss/_variables.scss b/_dev/src/scss/_variables.scss
@@ -53,6 +53,7 @@ $cdk-prefix: "cdk-";
     --#{$cdk-prefix}default-transition-duration,
     0.15s
   );
+  --#{$ua-prefix}header-height: var(--#{$cdk-prefix}header-height, 3.25rem);
   --#{$ua-prefix}header-offset: 10rem;
   --#{$ua-prefix}bo-background-color: var(--#{$ua-prefix}primary-200);
   --#{$ua-prefix}error-img-filter: none;
@@ -64,12 +65,14 @@ body {
     --#{$ua-prefix}bo-background-color: #eff1f2;
     --#{$ua-prefix}error-img-filter: invert(69%) sepia(66%) saturate(1340%) hue-rotate(151deg)
       brightness(88%) contrast(91%);
+    --#{$ua-prefix}header-height: 2.5rem;
   }
 
   &:has(.v1-7-3-0) {
     --#{$ua-prefix}bo-background-color: #eff1f2;
     --#{$ua-prefix}error-img-filter: invert(75%) sepia(64%) saturate(6023%) hue-rotate(161deg)
       brightness(96%) contrast(103%);
+    --#{$ua-prefix}header-height: 2.5rem;
   }
 }
 

diff --git a/_dev/src/scss/components/form/_switch.scss b/_dev/src/scss/components/form/_switch.scss
@@ -58,6 +58,7 @@ $e: ".ua-switch";
       position: absolute;
       width: 0;
       height: 0;
+      outline: none;
 
       &:checked {
         + #{$e}__label {

diff --git a/_dev/src/scss/layouts/_logs-pages.scss b/_dev/src/scss/layouts/_logs-pages.scss
@@ -4,13 +4,17 @@
 html {
   &:has(#{$ua-id}) {
     // Need class use in #ua_step_content to make it work
-    container-type: size;
-
     &:has(.update-page, .restore-page) {
+      container-type: size;
       container-name: html-height;
 
       body {
+        overflow-y: auto;
         background-color: var(--#{$ua-prefix}bo-background-color);
+
+        #nav-sidebar {
+          height: calc(100% - var(--#{$ua-prefix}header-height));
+        }
       }
 
       #main {