merge-upstream: remove some nonsensical scrollbars

TurboWarp · Dec 30, 2023 · f2eb878 · f2eb878
1 parent 09f93a1
commit f2eb878
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/asset-panel/selector.css b/src/components/asset-panel/selector.css
@@ -45,7 +45,8 @@ $fade-out-distance: 100px;
     /* Must have some height (recalculated by flex-grow) in order to scroll */
     height: 0;
     flex-grow: 1;
-    overflow-y: scroll;
+    overflow-y: auto;
+    overflow-x: hidden;
     display: flex;
     flex-direction: column;
 }

diff --git a/src/components/gui/gui.css b/src/components/gui/gui.css
@@ -29,8 +29,9 @@
     /*
         Stop scrollbar popping in and out from scratch-blocks border issue
         https://github.com/LLK/scratch-gui/issues/318
+        TW: and also fix double horizontal scrollbar at some screen sizes in paint editor
     */
-    overflow-y: hidden;
+    overflow: hidden;
 }
 
 .editor-wrapper {