Merge remote-tracking branch 'admin-ui/4.2'

ibexa · Oct 28, 2022 · ff70b9f · ff70b9f
2 parents 193378a + 290fe4f
commit ff70b9f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/bundle/Resources/public/scss/_grid-view.scss b/src/bundle/Resources/public/scss/_grid-view.scss
@@ -2,5 +2,5 @@
     display: flex;
     flex-wrap: wrap;
     padding-top: calculateRem(24px);
-    margin: 0 calculateRem(-14px);
+    margin: 0;
 }
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_grid.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_grid.scss
@@ -4,6 +4,7 @@
     &__items-wrapper {
         padding: 0 calculateRem(16px) calculateRem(16px);
         overflow: auto;
+        max-height: calc(100% - #{calculateRem(30px)});
     }
 
     .ibexa-grid-view-item {

diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss
@@ -9,8 +9,7 @@
     background-color: $ibexa-color-dark;
 
     .c-grid {
-        overflow-x: hidden;
-        overflow-y: auto;
+        overflow: hidden;
 
         &__items-wrapper {
             .c-thumbnail {