From fac6f18cda6a68eb8f136d0e9e2dfd4d4b2ab989 Mon Sep 17 00:00:00 2001 From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com> Date: Sat, 1 Dec 2018 18:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=8E=BB=E9=99=A4=E5=B1=8E?= =?UTF-8?q?=E9=BB=84=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/material/css/auth.css | 104 ++++++++------------ public/theme/material/css/project.min.css | 8 +- resources/views/material/auth/login.tpl | 11 +-- resources/views/material/auth/register.tpl | 19 ++-- resources/views/material/password/reset.tpl | 11 +-- resources/views/material/password/token.tpl | 11 +-- 6 files changed, 71 insertions(+), 93 deletions(-) diff --git a/public/theme/material/css/auth.css b/public/theme/material/css/auth.css index 2080edcf..f1fe6813 100755 --- a/public/theme/material/css/auth.css +++ b/public/theme/material/css/auth.css @@ -55,7 +55,7 @@ .auth-bottom { margin-top: 20px; - background: #666; + background: #7ea8bd; border-radius: 50% 50% 15px 15px; } .tgauth { @@ -84,7 +84,7 @@ border-radius: 50%; padding: 10px; color: white; - background: #ffa100; + background: #54aff9; } .auth-bottom .btn i { position: relative; @@ -93,47 +93,37 @@ } .auth-top { justify-content: space-between; - border-radius: 15px 15px 0 0; align-items: flex-end; + background: #bbdefb; + border-radius: 15px 15px 0 0; } + a.boardtop-right { color: white; - padding: 1.2em 1.7em; - background: #5e72e4; - border-radius: 0 15px 0 15px; + background: #54aff9; + padding: 3px 1.5em 2px 1.5em; + border-radius: 10px 0 0 0px; + box-shadow: 0 0 5px 0px #969696; + position: relative; text-align: center; - box-shadow: -1px 1px 5px 1px #969696; - text-decoration: none; - transition: .4s all; } a.boardtop-right:hover { - padding: 1.2em 2.2em; transition: .4s all; + text-decoration: none; } -.backtohome a { - color: white; -} - -.backtohome a div:last-of-type { - background: #ffa100; +a.boardtop-left { color: white; - padding: 8px; - border-radius: 0 10px 10px 0; - box-shadow: 1px 1px 5px 1px #969696; - position: relative; - right: 114px; - top: 6px; -} -.backtohome a div:first-of-type { - background: #ffa100; - padding: 10px 25px; - border-radius: 0 25px 25px 0; - margin-bottom: 15px; - box-shadow: 1px 1px 5px 1px #969696; + background: #54aff9; + padding: 3px 1.5em 2px 1.5em; + border-radius: 0 10px 0 0; + box-shadow: 0 0 5px 0px #969696; position: relative; - left: 40px; } +a.boardtop-left:hover { + text-decoration: none; +} + .backtohome div { display: inline-block; } @@ -170,21 +160,18 @@ a.boardtop-right:hover { margin-top: 36px; justify-content: center; } - +.btn-auth button { + background: #54aff9; +} .auth-logo { - left: 0; - right: unset; - bottom: unset; - top: -26px; - color: white; - background: #ffa100; - border-radius: 0 50px 50px 0; - text-align: right; - padding-right: 3em; + background: #bbdefb; + border-radius: 10px 10px 0 0; } -.auth-logo div:first-of-type { - font-size: 24px; - margin-top: 22px; +.auth-logo img { + max-width: 100px; + border-radius: 50%; + margin: 1em 0 1em 0; + box-shadow: 0 0 5px 0 #afafaf; } .auth-help-reg { @@ -279,17 +266,17 @@ a.boardtop-right:hover { justify-content: space-between; margin-bottom: 20px; } - a.boardtop-right,.backtohome a div:first-of-type { + a.boardtop-right,a.boardtop-left,.backtohome a div:first-of-type { font-size: 20px; } a.boardtop-right { - padding: 1.4em 2em; + padding: 5px 2em 3px 2em; } - a.boardtop-right:hover { - padding: 1.4em 2.5em; + a.boardtop-left { + padding: 5px 2em 3px 2em; } - .backtohome a div:first-of-type { - padding: 15px 30px; + .auth-top a div:last-of-type { + font-size: 16px; } #login,#reset { flex-basis: 74%; @@ -297,25 +284,13 @@ a.boardtop-right:hover { .auth-col-one.auth-main div#embed-captcha { flex-basis: 74%; } - .backtohome i { - font-size: 56px; - } - .backtohome a div:first-of-type { - left: 60px; - bottom: 4px; - } - .backtohome a div:last-of-type { - right: 145px; - } - .backtohome { - margin-top: 9px; - } + .auth-bottom .btn { padding: 10px; } .auth-bottom .btn i { font-size: 30px; - top: 1px; + left: .5px; } .tgauth span { font-size: 15px; @@ -360,6 +335,9 @@ a.boardtop-right:hover { .auth-top { margin-bottom: 10px; } + .auth-logo img { + max-width: 130px; + } } @media screen and (min-width:1440px) { diff --git a/public/theme/material/css/project.min.css b/public/theme/material/css/project.min.css index 494c41d8..85917449 100755 --- a/public/theme/material/css/project.min.css +++ b/public/theme/material/css/project.min.css @@ -963,8 +963,12 @@ a.tag-red,.tag-red { width: 160px; } .nodetitle a span { - font-size: 18px; - top: .9em; + font-size: 16px; + top: 1em; + } + .nodetitle a i { + font-size: 22px; + top: .7em; } .nodename { font-size: 14px; diff --git a/resources/views/material/auth/login.tpl b/resources/views/material/auth/login.tpl index 94224023..16551b0d 100755 --- a/resources/views/material/auth/login.tpl +++ b/resources/views/material/auth/login.tpl @@ -168,15 +168,14 @@
-
diff --git a/resources/views/material/auth/register.tpl b/resources/views/material/auth/register.tpl index 401e5c3a..183898b9 100755 --- a/resources/views/material/auth/register.tpl +++ b/resources/views/material/auth/register.tpl @@ -209,18 +209,17 @@
-
- {if $config['register_mode']!='close'}
diff --git a/resources/views/material/password/reset.tpl b/resources/views/material/password/reset.tpl index da2c5cef..d94c6609 100755 --- a/resources/views/material/password/reset.tpl +++ b/resources/views/material/password/reset.tpl @@ -7,15 +7,14 @@
-
diff --git a/resources/views/material/password/token.tpl b/resources/views/material/password/token.tpl index 7d20ab58..ac03d9cf 100755 --- a/resources/views/material/password/token.tpl +++ b/resources/views/material/password/token.tpl @@ -8,15 +8,14 @@