From 9685b539307c01c8e678a48f63d377144e2fdbf1 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Sat, 28 Mar 2020 13:29:49 +0800
Subject: [PATCH] update login and logo style

---
 app/view/index.html                         | 1 -
 app/web/src/components/SiderMenu/index.less | 2 +-
 app/web/src/layouts/UserLayout.less         | 3 +--
 app/web/src/pages/User/Login.js             | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/view/index.html b/app/view/index.html
index e49f3008..7beaed27 100644
--- a/app/view/index.html
+++ b/app/view/index.html
@@ -19,7 +19,6 @@
   window.routerBase = '/';
   window.resourceBaseUrl = '{{ helper.assets.resourceBase }}';
 </script>
-<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.6/dist/data-set.min.js"></script>
 {% if ctx.app.config.env === 'local' -%}
 {{ helper.assets.getScript('umi.dll.js') | safe }}
 {%- endif %}
diff --git a/app/web/src/components/SiderMenu/index.less b/app/web/src/components/SiderMenu/index.less
index 39905918..082b445d 100644
--- a/app/web/src/components/SiderMenu/index.less
+++ b/app/web/src/components/SiderMenu/index.less
@@ -21,7 +21,7 @@
     display: inline-block;
     vertical-align: middle;
     font-size: 20px;
-    margin: 0 0 0 12px;
+    margin: 3px 0 0 12px;
     font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
     font-weight: 600;
   }
diff --git a/app/web/src/layouts/UserLayout.less b/app/web/src/layouts/UserLayout.less
index d4ac3861..2262ac72 100644
--- a/app/web/src/layouts/UserLayout.less
+++ b/app/web/src/layouts/UserLayout.less
@@ -41,7 +41,6 @@
 }
 
 .header {
-  height: 44px;
   line-height: 44px;
   a {
     text-decoration: none;
@@ -60,7 +59,7 @@
   font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
   font-weight: 600;
   position: relative;
-  top: 2px;
+  top: 5px;
 }
 
 .desc {
diff --git a/app/web/src/pages/User/Login.js b/app/web/src/pages/User/Login.js
index 3ba2cf5d..d5cd4948 100644
--- a/app/web/src/pages/User/Login.js
+++ b/app/web/src/pages/User/Login.js
@@ -81,10 +81,10 @@ class LoginPage extends Component {
               login.type === 'account' &&
               !submitting &&
               this.renderMessage(formatMessage({ id: 'app.login.message-invalid-credentials' }))}
-            <UserName name="userName" placeholder="admin/user" />
+            <UserName name="userName" placeholder="username" />
             <Password
               name="password"
-              placeholder="888888/123456"
+              placeholder="password"
               onPressEnter={() => this.loginForm.validateFields(this.handleSubmit)}
             />
           </Tab>