From 615eec3b7a9339b9f8d2d48c6647059549f50308 Mon Sep 17 00:00:00 2001
From: Jimgo <li@2ha.me>
Date: Mon, 31 Mar 2025 10:19:13 +0800
Subject: [PATCH] =?UTF-8?q?:ok:=20=E7=A7=BB=E9=99=A4=E9=A4=90=E8=A1=A5?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97,=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/script.js |  2 +-
 src/main/resources/static/style.css | 33 +++++++++++++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/static/script.js b/src/main/resources/static/script.js
index 695f366..9e11f8f 100644
--- a/src/main/resources/static/script.js
+++ b/src/main/resources/static/script.js
@@ -115,7 +115,7 @@ function loadDakaList() {
                         '<button class="search-buttons detail-button">' + (signlog.end_time == null ? "未打卡" : signlog.end_time.substr(11, 5)) + '</button>' +
                         (signlog.autoDakaBeginTime == null ? "" : '<br><button class="search-buttons detail-button">定时上班卡时间: ' + signlog.autoDakaBeginTime + '</button>') +
                         (signlog.autoDakaEndTime == null ? "" : '<button class="search-buttons detail-button">定时下班卡时间: ' + signlog.autoDakaEndTime + '</button>') +
-                        (signlog.end_time != null && signlog.end_time.substr(11, 5) > "21:00" ? '<button class="search-buttons detail-button">餐补</button>' : '') +
+                        // (signlog.end_time != null && signlog.end_time.substr(11, 5) > "21:00" ? '<button class="search-buttons detail-button">餐补</button>' : '') +
                         '</div>' +
                         (index <= 3 ? '<div class="job-card-buttons">' +
                             '<button class="search-buttons card-buttons daka-buttons"' +
diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css
index 18678a5..53d6509 100644
--- a/src/main/resources/static/style.css
+++ b/src/main/resources/static/style.css
@@ -11,6 +11,7 @@
   --border-color: #d8d8d8;
   --alert-bg-color: #e8f2ff;
   --subtitle-color: #83838e;
+  --subtext-color: #d5d5d5;
   --inactive-color: #f0f0f0;
   --placeholder-color: #9b9ba5;
   --time-button: #fc5757;
@@ -95,7 +96,7 @@ body {
 }
 .dark-mode .detail-button {
   background-color: var(--inactive-color);
-  color: var(--subtitle-color);
+  color: var(--subtext-color);
 }
 
 .job {
@@ -468,7 +469,7 @@ body > div > div.userinfo_dialog > div > div > div input {
   border-radius: 6px;
   font-size: 13px;
   font-weight: 600;
-  margin-top: 14px;
+  margin-top: 6px;
 }
 
 .job-wrapper {
@@ -598,7 +599,7 @@ body > div > div.userinfo_dialog > div > div > div input {
   padding-top: 20px;
   /*padding-right: 80px;*/
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(6, 1fr);
   grid-column-gap: 25px;
   grid-row-gap: 25px;
   -webkit-animation: slideY .6s both;
@@ -713,13 +714,22 @@ body > div > div.userinfo_dialog > div > div > div input {
   padding: 6px 8px;
   border-radius: 4px;
 }
-.detail-button + .detail-button {
-  margin-left: 4px;
+/*.detail-button + .detail-button {*/
+/*  margin-left: 4px;*/
+/*}*/
+
+.job-detail-buttons {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-column-gap: 10px;
+  grid-row-gap: 25px;
 }
 
 .job-card-buttons {
-  display: -webkit-box;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-column-gap: 10px;
+  grid-row-gap: 25px;
   -webkit-box-align: center;
           align-items: center;
   -webkit-box-pack: justify;
@@ -739,14 +749,15 @@ body > div > div.userinfo_dialog > div > div > div input {
 .card-buttons,
 .card-buttons-msg {
   padding: 10px;
-  width: 100%;
+  min-width: 46%;
   font-size: 12px;
   cursor: pointer;
 }
 
-.card-buttons {
-  margin-right: 12px;
-}
+/*.card-buttons {*/
+/*  margin-right: 4%;*/
+/*  margin-left: 4%;*/
+/*}*/
 .card-buttons-msg {
   background-color: var(--inactive-color);
   color: var(--subtitle-color);