💄 UI: fix side fixed style error

ant-design · Jul 6, 2020 · 44a3597 · 44a3597
1 parent 9bd34f8
commit 44a3597
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docs/demo/base.tsx b/docs/demo/base.tsx
@@ -40,7 +40,6 @@ export default () => {
       <ProLayout
         {...defaultProps}
         style={{
-          height: 500,
           maxHeight: '100vh',
         }}
         location={{

diff --git a/src/BasicLayout.less b/src/BasicLayout.less
@@ -20,10 +20,11 @@
   &-content {
     position: relative;
     margin: 24px;
-    transition: all 0.2s;
+
     .@{ant-prefix}-pro-page-container {
       margin: -24px -24px 0;
     }
+
     &-disable-margin {
       margin: 0;
       > div > .@{ant-prefix}-pro-page-container {

diff --git a/src/GridContent/GridContent.less b/src/GridContent/GridContent.less
@@ -4,7 +4,6 @@
 .@{pro-layout-grid-content-prefix-cls} {
   width: 100%;
   min-height: 100%;
-  transition: 0.3s;
   &.wide {
     max-width: 1200px;
     margin: 0 auto;

diff --git a/src/SiderMenu/SiderMenu.tsx b/src/SiderMenu/SiderMenu.tsx
@@ -129,6 +129,9 @@ const SiderMenu: React.FC<SiderMenuProps> = (props) => {
           style={{
             width: collapsed ? 48 : siderWidth,
             overflow: 'hidden',
+            flex: `0 0 ${collapsed ? 48 : siderWidth}px`,
+            maxWidth: collapsed ? 48 : siderWidth,
+            minWidth: collapsed ? 48 : siderWidth,
             ...style,
           }}
         />