From 16d768d1addd1c4f2ce802cad7947aad3c0b51ab Mon Sep 17 00:00:00 2001
From: nikogu <644506165@qq.com>
Date: Mon, 23 Oct 2017 11:48:05 +0800
Subject: [PATCH] fixed design of result & user page

---
 src/components/Result/index.less | 13 +++++++------
 src/layouts/UserLayout.less      |  2 +-
 src/routes/User/Login.js         |  2 +-
 src/routes/User/Login.less       |  7 +++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/Result/index.less b/src/components/Result/index.less
index a3904e89..5e56c0cd 100644
--- a/src/components/Result/index.less
+++ b/src/components/Result/index.less
@@ -6,9 +6,9 @@
   margin: 0 auto;
 
   .icon {
-    font-size: 72px;
-    line-height: 72px;
-    margin-bottom: 24px;
+    font-size: 64px;
+    line-height: 64px;
+    margin-bottom: 32px;
 
     & > .success {
       color: @success-color;
@@ -20,15 +20,16 @@
   }
 
   .title {
-    font-size: 24px;
+    font-size: 20px;
     color: @heading-color;
     font-weight: 500;
-    line-height: 32px;
+    line-height: 28px;
     margin-bottom: 8px;
   }
 
   .description {
     font-size: 14px;
+    line-height: 22px;
     color: @text-color-secondary;
     margin-bottom: 16px;
   }
@@ -42,7 +43,7 @@
   }
 
   .actions {
-    margin-top: 32px;
+    margin-top: 40px;
 
     button:not(:last-child) {
       margin-right: 8px;
diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less
index e245a390..4bf31c8a 100644
--- a/src/layouts/UserLayout.less
+++ b/src/layouts/UserLayout.less
@@ -33,7 +33,7 @@
 .title {
   font-size: 33px;
   color: @heading-color;
-  font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+  font-family: 'Myriad Pro Semibold', Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif;
   position: relative;
   top: -2px;
 }
diff --git a/src/routes/User/Login.js b/src/routes/User/Login.js
index dc441ea1..95ae7743 100644
--- a/src/routes/User/Login.js
+++ b/src/routes/User/Login.js
@@ -78,7 +78,7 @@ export default class Login extends Component {
     return (
       <div className={styles.main}>
         <Form onSubmit={this.handleSubmit}>
-          <Tabs className={styles.tabs} activeKey={type} onChange={this.onSwitch}>
+          <Tabs animated={false} className={styles.tabs} activeKey={type} onChange={this.onSwitch}>
             <TabPane tab="账户密码登录" key="account">
               {
                 login.status === 'error' &&
diff --git a/src/routes/User/Login.less b/src/routes/User/Login.less
index fb318b91..3c29ba0e 100644
--- a/src/routes/User/Login.less
+++ b/src/routes/User/Login.less
@@ -7,6 +7,12 @@
   .tabs {
     padding: 0 2px;
     margin: 0 -2px;
+    :global {
+      .ant-tabs-tab {
+        font-size: 16px;
+        line-height: 24px;
+      }
+    }
   }
 
   :global {
@@ -82,6 +88,7 @@
   .other {
     text-align: left;
     margin-top: 24px;
+    line-height: 22px;
 
     .register {
       float: right;
-- 
GitLab