From 6947b43d3c37ef3f1d4f40aec85fa8b66817cd8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 09:11:04 +0900 Subject: [PATCH 1/4] =?UTF-8?q?TEST=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/common/menu-modal.html | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/front/src/main/resources/templates/common/menu-modal.html b/front/src/main/resources/templates/common/menu-modal.html index b0882169..b3e9d501 100644 --- a/front/src/main/resources/templates/common/menu-modal.html +++ b/front/src/main/resources/templates/common/menu-modal.html @@ -12,7 +12,32 @@ diff --git a/front/src/main/resources/templates/layout/layout-subar.html b/front/src/main/resources/templates/layout/layout-subar.html index 824ac97e..9de27790 100644 --- a/front/src/main/resources/templates/layout/layout-subar.html +++ b/front/src/main/resources/templates/layout/layout-subar.html @@ -36,7 +36,7 @@ - + diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 116e3144..363ffe6d 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -37,7 +37,7 @@ - + From d3ca80da89f20a5488a4123a2b06aed1a458dfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 09:33:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=ED=8C=9D=EC=97=85=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/record/daily/index.html | 2 +- front/src/main/resources/templates/record/expense/index.html | 2 +- front/src/main/resources/templates/record/farming/index.html | 2 +- front/src/main/resources/templates/record/forestry/index.html | 2 +- front/src/main/resources/templates/record/income/index.html | 2 +- front/src/main/resources/templates/record/power/index.html | 2 +- front/src/main/resources/templates/record/work/index.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index 625942ce..919da8d3 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -110,7 +110,7 @@ - + diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 548ff5b4..e040b855 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -130,7 +130,7 @@ - + diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index 1385e2c2..2626c70c 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -133,7 +133,7 @@ - + diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index 467609a9..92683ec5 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -133,7 +133,7 @@ - + diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 4d0a2b73..86c0727d 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -137,7 +137,7 @@ - + diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index cc1b9a0f..54d38d4e 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -118,7 +118,7 @@ - + diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index 0f51e0f7..49db622c 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -179,7 +179,7 @@ - + From 0b5c59e76e2ecf0217ea7db64539b0a812f3386a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 09:36:30 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=ED=8D=BC=EB=B8=94=20=EC=98=AE=EA=B8=B0?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/assets/styles/style.css | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/admin/src/main/resources/static/assets/styles/style.css b/admin/src/main/resources/static/assets/styles/style.css index cd3bc019..065f253e 100644 --- a/admin/src/main/resources/static/assets/styles/style.css +++ b/admin/src/main/resources/static/assets/styles/style.css @@ -6637,6 +6637,9 @@ input[type=number] { width: 14rem; } .filter-wrap .component-btns { + min-width: -webkit-max-content; + min-width: -moz-max-content; + min-width: max-content; margin-top: auto; } .filter-wrap .btn { @@ -6704,6 +6707,9 @@ input[type=number] { .table-group .table-tit-group .bottom-btn-group { margin-top: 0; } +.table-group .table-tit-group .component-select { + width: 14rem; +} table { table-layout: fixed; @@ -7192,6 +7198,8 @@ table tbody th { justify-content: space-between; } .dounut-chart-area .chart-group { + -webkit-flex-wrap: wrap; + flex-wrap: wrap; display: -webkit-box; display: -webkit-flex; display: flex; @@ -7234,16 +7242,18 @@ table tbody th { margin-top: 3.2rem; } .dounut-chart-area .chart-group dl dd .percent { + margin-right: 2rem; position: relative; display: block; font-size: 5.6rem; font-weight: 700; + letter-spacing: -1px; } .dounut-chart-area .chart-group dl dd .percent::after { position: absolute; content: "%"; display: block; - right: -1.8rem; + right: -3.5rem; top: 0; } .dounut-chart-area .chart-group dl dd .d-flex { @@ -7289,8 +7299,8 @@ table tbody th { left: 50%; -webkit-transform: translateX(-50%); transform: translateX(-50%); - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; } @@ -7303,8 +7313,8 @@ table tbody th { transform: translateX(-50%) rotate(calc(var(--percent) * 3.6deg)); -webkit-transform-origin: center 80px; transform-origin: center 80px; - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; }