From 2f928329d16db6be4fda98c82d6d952efc3ff6a3 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Wed, 10 Oct 2018 22:06:13 +0800
Subject: [PATCH] fix style.

---
 src/components/Layout/Sider.js |  2 +-
 src/layouts/PrimaryLayout.js   |  7 ++-----
 src/layouts/PrimaryLayout.less | 13 +++++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/Layout/Sider.js b/src/components/Layout/Sider.js
index 177c428..6b07234 100644
--- a/src/components/Layout/Sider.js
+++ b/src/components/Layout/Sider.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
-import { Icon, Switch, Layout, Drawer } from 'antd'
+import { Icon, Switch, Layout } from 'antd'
 import { withI18n, Trans } from '@lingui/react'
 import { config } from 'utils'
 import SiderMenu from './Menu'
diff --git a/src/layouts/PrimaryLayout.js b/src/layouts/PrimaryLayout.js
index df51fe4..365913a 100644
--- a/src/layouts/PrimaryLayout.js
+++ b/src/layouts/PrimaryLayout.js
@@ -108,10 +108,7 @@ class PrimaryLayout extends PureComponent {
           ) : (
             <Sider {...siderProps} />
           )}
-          <Layout
-            style={{ height: '100vh', overflowY: 'scroll' }}
-            id="primaryLayout"
-          >
+          <div className={styles.container} id="primaryLayout">
             <Header {...headerProps} />
             <Content className={styles.content}>
               <Bread routeList={routeList} />
@@ -122,7 +119,7 @@ class PrimaryLayout extends PureComponent {
               target={() => document.getElementById('primaryLayout')}
             />
             <GlobalFooter copyright={config.copyright} />
-          </Layout>
+          </div>
         </Layout>
       </Fragment>
     )
diff --git a/src/layouts/PrimaryLayout.less b/src/layouts/PrimaryLayout.less
index bd157d6..b28bbf6 100644
--- a/src/layouts/PrimaryLayout.less
+++ b/src/layouts/PrimaryLayout.less
@@ -16,3 +16,16 @@
 .content {
   padding: 24px;
 }
+
+.container {
+  height: 100vh;
+  overflow-x: hidden;
+  overflow-y: scroll;
+  flex: 1;
+}
+
+:global {
+  .antd-pro-global-footer-globalFooter {
+    margin-top: 16px;
+  }
+}