From b0d1a2284ec6743b427ec264994a1f81aa7c8387 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Wed, 30 Jan 2019 11:17:44 +0800
Subject: [PATCH] =?UTF-8?q?issue=EF=BC=9A=E5=A4=84=E7=90=86=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E4=BE=A7=E8=BE=B9=E6=94=B6=E7=BC=A9=E4=B8=8D=E4=BA=86?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/manager/index.ftl | 7 +++----
src/main/webapp/WEB-INF/manager/login.ftl | 4 ++--
src/main/webapp/static/ms-admin/4.7.0/css/index.css | 1 +
src/main/webapp/static/ms-admin/4.7.0/less/index.less | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index 390cebd7..57c2c3fd 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -2,15 +2,14 @@
-
<#include "/include/head-file.ftl"/>
<#include "/reset-password.ftl"/>
<#include "/exit-system.ftl"/>
-
+
+
+
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index aaed898c..9bfc7cfe 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -3,8 +3,8 @@
-
+ <#include "/include/head-file.ftl"/>
+
diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
index 508af214..15ccbb29 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
@@ -308,6 +308,7 @@ textarea::-webkit-input-placeholder {
position: absolute;
right: -34px;
top: 50%;
+ z-index: 9999;
cursor: pointer;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {
diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
index 56b01983..062f0366 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less
+++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
@@ -183,6 +183,7 @@
position: absolute;
right: -34px;
top: 50%;
+ z-index:9999;
cursor: pointer;
// 收缩
i{