From d45ecebff338a64880564ba8b5f1202fd97f8219 Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Fri, 8 Oct 2021 11:56:58 +0800 Subject: [PATCH] mgt login ui --- .../templates/views/layout/nologintop.ftl | 53 +++++++++++-------- .../main/resources/templates/views/login.ftl | 6 +-- .../main/resources/static/css_mgt/base.css | 2 +- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/nologintop.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/nologintop.ftl index a56e5e0b..9d2699ae 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/nologintop.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/nologintop.ftl @@ -1,26 +1,35 @@ -
-
-
-
-
<@locale code="global.application"/>
-
-
-
- - <@locale code="global.change.language.en" /> - - | - - <@locale code="global.change.language.zh" /> - -
-
- <@locale code="global.change.language" />   - -
-
-
+
+
+
+
+
+
+
<@locale code="global.application"/>
+
+
+
+
+
+ + + + + +
<@locale code="global.change.language"/> : + +
+
+
+
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl index fc671b90..45ebb834 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl @@ -5,14 +5,14 @@ <#include "layout/common.cssjs.ftl"/> -<#include "layout/nologintop.ftl"/> + <#include "layout/nologintop.ftl"/>
-
+
- <@locale code="login.text.login.normal" /> +  
diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css index 891cebb6..e1197e9a 100644 --- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css +++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css @@ -251,7 +251,7 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li { border-bottom: 1px solid #e5e5e5; min-width: 100%; text-align:left; - height:60px; + min-height: 60px; margin-bottom: 1px; } #topNav{