diff --git a/src/components/Result/index.less b/src/components/Result/index.less index a3904e89a28c30d7be608c9b58abd9457ec99bf1..5e56c0cd62e9888150765eaae53c50e9645fc1a9 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 e245a390646bd7378fa9708cfa34cd33e8b6726a..4bf31c8a98a70d462402f2097d9845db3b1ecbcf 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 dc441ea10aa75dbc2c6f63ee751f452e00a39088..95ae7743750d338383b2e2ec5f8e3ae3f2a2657a 100644 --- a/src/routes/User/Login.js +++ b/src/routes/User/Login.js @@ -78,7 +78,7 @@ export default class Login extends Component { return (
- + { login.status === 'error' && diff --git a/src/routes/User/Login.less b/src/routes/User/Login.less index fb318b91aed4127ca6d2ad9f07983a7e4af5a2d1..3c29ba0e967b7c276c0daf888a1ebeda575f915b 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;