From e3e093fa602662d131af12b5429f0d5020b9f572 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 09 二月 2022 16:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms
---
src/main/webapp/static/js/projectShow.js | 6 +++---
src/main/webapp/static/css/style.css | 25 ++++++++++++++++---------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index 69f5963..845dda4 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -113,8 +113,8 @@
}
#tips h3 {
text-indent: 1em;
- height: 40px;
- line-height: 40px;
+ height: 36px;
+ line-height: 36px;
background-color: #2E4E7E;
color: #FFFFFF;
}
@@ -173,7 +173,7 @@
position: absolute;
float: left;
width: 11%;
- margin-top: 1%;
+ margin-top: 0.5%;
margin-left: 1%;
}
/*琛ㄥご*/
@@ -184,7 +184,7 @@
}
.tab-head>th {
width: 73px;
- height: 35px;
+ height: 30px;
}
.tab-head>th:first-child {
width: 55px;
@@ -197,7 +197,7 @@
}
.tab-body>td {
width: 73px;
- height: 52px;
+ height: 48px;
text-align: center;
}
.tab-body>td:first-child {
@@ -209,8 +209,8 @@
position: absolute;
clear: both;
background-color: #FFF;
- width: 86%;
- margin-top: 1%;
+ width: 87%;
+ margin-top: 0.5%;
margin-left: 12%;
overflow-x: scroll;
}
@@ -221,11 +221,11 @@
}
#details-tab th {
- height: 35px;
+ height: 30px;
width: 55px;
}
#details-tab td {
- height: 27px;
+ height: 25px;
text-align: center;
position: relative;
}
@@ -251,6 +251,13 @@
+#tot td:hover {
+ background-color: #0c64eb;
+}
+
+
+
+
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 2ac3849..7dc238c 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -77,9 +77,9 @@
+'</thead>'
+'<tbody>' // 琛ㄨ韩 锛堥」鐩妭鐐瑰鏈級
+'<tr class="tab-body">'
- +'<td style="height: 54px">'+'椤圭洰鎬绘椂闀�'+'</td>'
- +'<td style="height: 54px">'+project.startDay.substring(0,10)+'</td>'
- +'<td style="height: 54px">'+project.endDay.substring(0,10)+'</td>'
+ +'<td style="height: 50px">'+'椤圭洰鎬绘椂闀�'+'</td>'
+ +'<td style="height: 50px">'+project.startDay.substring(0,10)+'</td>'
+ +'<td style="height: 50px">'+project.endDay.substring(0,10)+'</td>'
+'</tr>'
var tabLeft4 = tabLeft + tabLeft3 +'</tbody>'
--
Gitblit v1.9.1