chore: merge branch 'master' into issues-2429

ng-alain · Oct 17, 2023 · 3dfddaa · 3dfddaa
2 parents 71bbb34 + 1b59e80
commit 3dfddaa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/packages/abc/st/style/index.less b/packages/abc/st/style/index.less
@@ -95,8 +95,7 @@
       right: 0;
       bottom: 0;
       display: flex;
-      align-items: center;
-      justify-items: center;
+      place-items: center center;
     }
 
     .@{ant-prefix}-table-filter-trigger {

diff --git a/packages/theme/layout-default/style/_aside.less b/packages/theme/layout-default/style/_aside.less
@@ -28,8 +28,7 @@
 
   &-inner {
     flex: 1 1 0%;
-    overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-x: hidden scroll;
     -webkit-overflow-scrolling: touch;
     scroll-snap-type: proximity;
     scroll-snap-points-x: snaplist(100%, 200%, 300%, 400%, 500%);

diff --git a/packages/theme/system/utils/_scrollbar.less b/packages/theme/system/utils/_scrollbar.less
@@ -29,13 +29,11 @@
   overflow: auto;
 
   &-x {
-    overflow-x: auto;
-    overflow-y: hidden;
+    overflow: auto hidden;
   }
 
   &-y {
-    overflow-x: hidden;
-    overflow-y: auto;
+    overflow: hidden auto;
   }
 }