From 6f3e409a22448ec3bc5e7ddcfcd283482dfb4e9b Mon Sep 17 00:00:00 2001 From: laurier <14360417+laurieryayoi@users.noreply.github.com> Date: Sat, 17 Nov 2018 00:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9clash=E9=93=BE=E6=8E=A5&newpa?= =?UTF-8?q?sswdreset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/material/css/auth.css | 9 +- resources/views/material/header.tpl | 4 +- resources/views/material/password/reset.tpl | 89 ++++++++-------- resources/views/material/password/token.tpl | 109 +++++++++----------- resources/views/material/user/index.tpl | 2 +- 5 files changed, 103 insertions(+), 110 deletions(-) mode change 100644 => 100755 resources/views/material/password/reset.tpl mode change 100644 => 100755 resources/views/material/password/token.tpl diff --git a/public/theme/material/css/auth.css b/public/theme/material/css/auth.css index 185add58..67acf21b 100755 --- a/public/theme/material/css/auth.css +++ b/public/theme/material/css/auth.css @@ -157,6 +157,9 @@ a.boardtop-right { .auth-help-table { justify-content: space-around; } +.auth-help-table.auth-reset { + justify-content: center; +} .btn-auth { margin-left: 2em; @@ -268,7 +271,7 @@ a.boardtop-right { .backtohome a div:first-of-type { padding: 15px 30px; } - #login { + #login,#reset { flex-basis: 74%; } .auth-col-one.auth-main div#embed-captcha { @@ -304,7 +307,7 @@ a.boardtop-right { left: 18px; width: 200px; } - #login,.btn-reg { + #login,#reset,.btn-reg { font-size: 16px; padding: 10px; margin-top: 10px; @@ -316,7 +319,7 @@ a.boardtop-right { .btn-reg { margin-top: 0; } - .auth-row.row-login { + .auth-row.row-login { flex-basis: 40%; } .auth-col-one.auth-main .auth-row.row-login { diff --git a/resources/views/material/header.tpl b/resources/views/material/header.tpl index 26d9eb8e..3fc970bc 100755 --- a/resources/views/material/header.tpl +++ b/resources/views/material/header.tpl @@ -21,7 +21,7 @@ .divcss5{ position:fixed; bottom:0;} -
+ {*
- + *} {if $config["enable_crisp"] == 'true'}{include file='crisp.tpl'}{/if} diff --git a/resources/views/material/password/reset.tpl b/resources/views/material/password/reset.tpl old mode 100644 new mode 100755 index a56e777d..da2c5cef --- a/resources/views/material/password/reset.tpl +++ b/resources/views/material/password/reset.tpl @@ -1,49 +1,52 @@ {include file='header.tpl'} - -
- -
+ {include file='footer.tpl'} diff --git a/resources/views/material/password/token.tpl b/resources/views/material/password/token.tpl old mode 100644 new mode 100755 index 083dba29..7d20ab58 --- a/resources/views/material/password/token.tpl +++ b/resources/views/material/password/token.tpl @@ -2,63 +2,58 @@ {include file='header.tpl'} -
+ +
-
-
-
-
-
-
-
-

重置密码

-
-
-
-

- - Login - -

- - - -
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- -
-
-
- - - -
-
+ +
+
+ - +
+ - +
+
+ +
+ +
+ +
+ +
+
+

请妥善保管好自己的登录密码

+
+
+
+ +
+
+ +
+
+
+
@@ -66,11 +61,7 @@ -
-
-
-
-
+ {include file='footer.tpl'} diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index 089dec3c..3b6be6f8 100755 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -339,7 +339,7 @@