From 51b59b6534012af93c35bcb9c95086b64f5dfe7e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 12 九月 2022 13:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/webapp/static/css/style3.css |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/css/style3.css b/src/main/webapp/static/css/style3.css
index c8fecac..5e3ca21 100644
--- a/src/main/webapp/static/css/style3.css
+++ b/src/main/webapp/static/css/style3.css
@@ -73,12 +73,12 @@
 
 #main-tab {
 	margin-top: 1%;
-	width: 198%;
+	width: 298%;
 	align: center;
 	color: #d9d9d9;
 	margin-left: 1%;
 	margin-right: 1%;
-	margin-bottom: 5%;
+	margin-bottom: 10%;
 	/*min-height: 1080px;*/
 	/*height: auto !important;*/
 	/*height: 1080px;*/
@@ -222,7 +222,7 @@
 }
 .tab-body>td {
 	width: 73px;
-	height: 30px;
+	height: 31px;
 	text-align: center;
 }
 .tab-body>td:first-child {
@@ -341,9 +341,47 @@
 
 }
 
-
-
-
+#realTime {
+	width: 30%;
+	height: 20%;
+	background-color: #FFF;
+	box-shadow: 0px 5px 20px #000;
+	border-radius: 15px;
+	position: absolute;
+	top:30%;
+	left:35%;
+	display: none;
+}
+#realTime .text {
+	text-indent: 1em;
+	height: 36px;
+	line-height: 36px;
+	background-color: #2E4E7E;
+	color: #FFFFFF;
+}
+#realTime .input {
+	height: 80px;
+	text-align: center;
+	line-height: 80px;
+}
+#closeed {
+	display: inline-block;
+	color: #FFFFFF;
+	height: 30px;
+	width: 80px;
+	background-color: #354352;
+	border: 1px #354352;
+	border-radius: 30px;
+	position: relative;
+	left: 50%;
+	top: 5%;
+	transform: translate(-50% ,-30%);
+}
+.admin-form {
+	padding: 25px 30px 0 0 !important;
+	margin: 0 !important;
+}
+.text-right{text-align:right}
 
 
 

--
Gitblit v1.9.1