From bbc2a41c8f14f0771dad4d2e63c9acd8c728b25f Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 29 Aug 2017 12:01:57 +0800
Subject: [PATCH] Fix Footer margin

---
 src/components/GlobalFooter/index.less |  2 +-
 src/layouts/BasicLayout.js             | 30 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/GlobalFooter/index.less b/src/components/GlobalFooter/index.less
index 90461690..2483aa3f 100644
--- a/src/components/GlobalFooter/index.less
+++ b/src/components/GlobalFooter/index.less
@@ -1,7 +1,7 @@
 @import "~antd/lib/style/themes/default.less";
 
 .globalFooter {
-  padding: 32px 28px 16px;
+  margin: 32px 28px 16px;
   text-align: center;
 
   .links {
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index d9221577..3738e444 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -229,23 +229,23 @@ class BasicLayout extends React.PureComponent {
                 </Dropdown>
               </div>
             </Header>
-            <Content style={{ margin: 24, height: '100%' }}>
+            <Content style={{ margin: '24px 24px 0 24px', height: '100%' }}>
               {children}
-              <GlobalFooter
-                links={[{
-                  title: '帮助',
-                  href: '',
-                }, {
-                  title: '隐私',
-                  href: '',
-                }, {
-                  title: '条款',
-                  href: '',
-                  blankTarget: true,
-                }]}
-                copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>}
-              />
             </Content>
+            <GlobalFooter
+              links={[{
+                title: '帮助',
+                href: '',
+              }, {
+                title: '隐私',
+                href: '',
+              }, {
+                title: '条款',
+                href: '',
+                blankTarget: true,
+              }]}
+              copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>}
+            />
           </Layout>
         </Layout>
       </DocumentTitle>
-- 
GitLab