From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/css/common.css | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index 6f8de0e..8e4fab9 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -1,12 +1,36 @@
-*, *::before, *::after {
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0;
- padding: 0;
-}
+/**, *::before, *::after {*/
+/* -webkit-box-sizing: border-box;*/
+/* box-sizing: border-box;*/
+/* margin: 0;*/
+/* padding: 0;*/
+/*}*/
body {
background-color: #fff;
+}
+
+input::placeholder {
+ color: #b4b4b4;
+}
+input::-webkit-input-placeholder { /* WebKit browsers 閫傞厤璋锋瓕 */
+ color: #b4b4b4;
+}
+.layui-input input:-moz-placeholder { /* Mozilla Firefox 4 to 18 閫傞厤鐏嫄 */
+ color: #b4b4b4;
+}
+.layui-input input::-moz-placeholder { /* Mozilla Firefox 19+ 閫傞厤鐏嫄 */
+ color: #b4b4b4;
+}
+.layui-input input:-ms-input-placeholder { /* Internet Explorer 10+ 閫傞厤ie*/
+ color: #b4b4b4;
+}
+
+/* layui浼樺寲 */
+.layui-form-label {
+ /*color: #595959;*/
+}
+.layui-input:focus {
+ border-color: #007bff !important;
}
/*鎼滅储鏍�*/
.layui-form.layui-card-header {
@@ -17,10 +41,11 @@
margin-left: 10px;
z-index: 999;
position: relative;
+ padding: 30px 30px 10px 30px;
}
#search-box .layui-inline{
margin-bottom: 10px;
- margin-right: 15px;
+ margin-right: 5px;
}
#search-box .layui-input-inline {
width: 150px;
@@ -31,14 +56,13 @@
text-align: right;
}
#data-search-btn {
- margin-top: 10px;
- display: flex;
+ display: inline-block;
+ margin: 8px 0 0 10px;
justify-content: center;
align-items: center;
- margin-bottom: 0;
}
#data-search-btn.layui-btn-container .layui-btn{
- margin-right: 30px;
+ margin-right: 20px;
}
/*澶村伐鍏锋爮*/
@@ -74,9 +98,9 @@
.layui-table-box{
padding-bottom: 10px;
}
-.layui-table-body.layui-table-main{
- overflow: hidden;
-}
+/*.layui-table-body.layui-table-main{*/
+/* overflow: hidden;*/
+/*}*/
.layui-table-page{
border-width: 0;
}
@@ -152,8 +176,6 @@
height: 200px;
}
-
-
/*
甯冨眬
*/
@@ -167,7 +189,6 @@
.col{
height: inherit;
}
-
/*鏉冮檺*/
#btn-add {
@@ -201,4 +222,4 @@
/* 鍋氬搷搴斿紡甯冨眬鏃讹紝涓嶅缓璁敤鍥哄畾灏哄锛屽敖閲忕敤% */
@media only screen and (max-width: 800px) {
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1