From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/css/style.css | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index f1f23fa..f8fc7aa 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -1,17 +1,23 @@
*{
margin: 0;
/*overflow: hidden;*/
+ font-size: 10px;
}
-html,body{
- height: 100%;
+html {
+ height: 100%;
+}
+
+body{
+ background-color: #2e4e7e;
+ height: 500px;
+ width: 100%;
}
/* 鐢诲竷 */
#root {
- /*height: 100%;*/
- min-height:100%;
- width: 100%;
- margin: 0;
- background-color: /* #2C3E50 */ #2e4e7e;
+ /*height: 100%;*/
+ width: 100%;
+ /*margin: 0;*/
+ /*background-color: !* #2C3E50 *! #2e4e7e;*/
position: relative;
}
#top-tab {
@@ -40,6 +46,7 @@
color:white;
line-height: 94px;
text-align: center;
+ font-size: 40px;
}
#showTime {
width: 350px;
@@ -67,17 +74,18 @@
#main-tab {
margin-top: 1%;
width: 98%;
- align: center;
color: #d9d9d9;
margin-left: 1%;
+ margin-right: 1%;
+ margin-bottom: 10%;
}
#main-tab,th,td{
border: 1px solid #fff;
cursor: default;
}
#main-tab th {
- height: 50px;
- width: 50px;
+ height: 40px;
+ width: 25px;
background-color: /* #223962 */#3a4a5a;
}
@@ -119,7 +127,7 @@
background-color: #FFF;
box-shadow: 0px 5px 20px #000;
border-radius: 15px;
- position: relative;
+ position: absolute;
top:30%;
left:35%;
display: none;
--
Gitblit v1.9.1