From de6b4819fab29c6a167916d66ed10ec99cfba7eb Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 05 Dec 2020 07:12:55 +0800
Subject: [PATCH] Merge branch 'master' into hive2.0
---
zq-erp/src/main/resources/templates/views/common/login.html | 13 +++++++++++++
zq-erp/src/main/resources/static/css/styleOne/style.min.css | 2 +-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/static/css/styleOne/style.min.css b/zq-erp/src/main/resources/static/css/styleOne/style.min.css
index a1a6404..5e1b542 100644
--- a/zq-erp/src/main/resources/static/css/styleOne/style.min.css
+++ b/zq-erp/src/main/resources/static/css/styleOne/style.min.css
@@ -1833,7 +1833,7 @@
border: 1px solid #d7d8d9;
color: #373d41;
display: block;
- padding: 20px 12px;
+ padding: 6px 12px;
width: 100%;
font-size: 14px -webkit-box-shadow: none !important;
box-shadow: none !important;
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index 7679c14..f8bf84f 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -59,6 +59,19 @@
<link th:href="@{/css/styleOne/login.min.css}" rel="stylesheet">
<style type="text/css">
+ .form-control {
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #d7d8d9;
+ color: #373d41;
+ display: block;
+ padding: 20px 12px;
+ width: 100%;
+ font-size: 14px -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ border-radius: 0px !important;
+ }
+
.layui-layer-content {
color: #000;
}
--
Gitblit v1.9.1