From ad0742cc3edc0749c271ca5d10e921e44dce9eec Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Thu, 19 Jan 2023 14:54:28 +0900 Subject: [PATCH 1/4] =?UTF-8?q?ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/common.css | 35 ++++++++++++++++++- .../templates/faRpt/faRptViewModal.html | 22 ++++++------ .../resources/templates/fragments/footer.html | 2 +- .../resources/templates/fragments/header.html | 2 +- .../templates/fragments/leftMenu.html | 10 +++--- .../resources/templates/layout/layout.html | 4 +-- .../resources/templates/login/dashboard.html | 4 +-- .../publicBoard/notice/noticeEditModal.html | 12 +++---- .../publicBoard/notice/noticePage.html | 6 ++-- .../publicBoard/notice/noticeViewModal.html | 10 +++--- 10 files changed, 70 insertions(+), 37 deletions(-) diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index d5d6a89a..1c0660ab 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -59,6 +59,14 @@ content: url("/img/bootstrap-icons-1.9.1/caret-down-fill.svg"); } +.btn-toggle2::before { + content: url("/img/bootstrap-icons-1.9.1/caret-right.svg"); + filter: invert(100%); +} +.btn-toggle2[aria-expanded="true"]::before { + content: url("/img/bootstrap-icons-1.9.1/caret-down.svg"); +} + .f-invert{ filter: invert(100%); } @@ -122,4 +130,29 @@ position: absolute; top: 6rem; left: 4.3rem; -} \ No newline at end of file +} + +/*.bg-header{*/ +/* !*background-color: #6c87af78;*!*/ +/* !*background-color: #6885bfb0;*!*/ +/* background-color: #1650a778;*/ +/*}*/ +/*.bg-lightB{*/ +/* background-color: #deebff78;*/ +/*}*/ +/*.bg-blue{*/ +/* !*background-color: #1f2f5c;*!*/ +/* background-color: #24396c;*/ +/*}*/ +/*.bg-leftMenu{*/ +/* background-color: #253660;*/ +/*}*/ + +/*.table-color{*/ +/* background-color: #6c87af78;*/ +/*}*/ + +/*.bi-square-fill{*/ +/* color:#0d49a7;*/ +/* !*color: #24396c;*!*/ +/*}*/ \ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html index b35ce0a2..0523e36f 100644 --- a/src/main/resources/templates/faRpt/faRptViewModal.html +++ b/src/main/resources/templates/faRpt/faRptViewModal.html @@ -20,36 +20,36 @@
- +
- + - + - +

- +

- +
-
no
-
수신자
-
열람
+
no
+
수신자
+
열람

@@ -83,8 +83,8 @@ - - + + diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index e37b6e7d..ce82c7f8 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -3,7 +3,7 @@
- logo + logo
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 88a58bbe..ef649cb2 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -2,7 +2,7 @@ -
+
파일명사이즈파일명사이즈
- + diff --git a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html index 5e8f453e..c2853aee 100644 --- a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html +++ b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html @@ -1,6 +1,6 @@ -
제목 관서
- - - + + + diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 8910ba23..df6e0a36 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -14,7 +14,7 @@
-
+
diff --git a/src/main/resources/templates/publicBoard/notice/noticePage.html b/src/main/resources/templates/publicBoard/notice/noticePage.html index cf013581..351d0453 100644 --- a/src/main/resources/templates/publicBoard/notice/noticePage.html +++ b/src/main/resources/templates/publicBoard/notice/noticePage.html @@ -13,7 +13,7 @@
-
+
From 4d30b2ac433f7b60f773ad7b97f18935bca2266a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 19 Jan 2023 18:14:49 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnlawfulFishingController.java | 2 +- src/main/resources/static/css/common.css | 4 +- .../fishingBoat/fishingBoatMgt.html | 3 - .../fishingBoat/fishingBoatViewModal.html | 158 +++++++++--------- .../unlawfulFishing/versionInfo.html | 128 +++++++------- 5 files changed, 147 insertions(+), 148 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java index 506a00d4..4abff8b0 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java @@ -33,7 +33,7 @@ public class UnlawfulFishingController { @GetMapping("/crackdownStatusVersionInfo") public ModelAndView selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo){ - ModelAndView mav = new ModelAndView("/faStatistics/unlawfulFishing/versionInfo"); + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/versionInfo"); mav.addObject("infos", unlawfulFishingService.selectUnlawfulFishingVersionInfo(cdsKey, versionNo)); return mav; } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 2caf94ac..280075c0 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -150,7 +150,9 @@ .bg-leftMenu{ background-color: #253660; } - +.bg-label{ + background-color: lightblue; +} .table-color{ background-color: #6c87af78; } diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index e3869ce2..e7e41b10 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -14,9 +14,6 @@ display: none; z-index: 10; } - .bg-gainsboro{ - background-color: gainsboro; - }
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html index c888eac1..d428ff8b 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html @@ -40,15 +40,15 @@
- +
- +
- +
@@ -62,23 +62,23 @@
- +
- +
- +
- +
@@ -86,31 +86,31 @@
- +
- +
- +
- +
- +
- +
@@ -124,47 +124,47 @@ crackdownStatus.materialDamageDetail ne null}">
- +
- +
- + - + - +
- +
- +
- + - +
- +
@@ -178,13 +178,13 @@ crackdownStatus.fishingBoat.catchCnt ne 0}">
- +
- + - + @@ -202,7 +202,7 @@
- +
@@ -233,27 +233,27 @@
- +
- +
- +
- +
- +
@@ -265,7 +265,7 @@
- +
@@ -275,23 +275,23 @@
- +
- +
- +
- +
@@ -305,7 +305,7 @@
■ 어선 정보
- +
@@ -314,37 +314,37 @@
- +
- +
- +
- +
- +
- +
- +
@@ -353,40 +353,40 @@
- + - + - + - +
- + - + - +
- +
- +
- +
- + - +
- +
- + - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -494,17 +494,17 @@
- +
- +
- +
@@ -512,7 +512,7 @@
- +
@@ -520,7 +520,7 @@
- +
@@ -530,7 +530,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html index 2c5c2df1..252e888f 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html @@ -20,15 +20,15 @@
- +
- +
- +
@@ -42,23 +42,23 @@
- +
- +
- +
- +
@@ -68,31 +68,31 @@
- +
- +
- +
- +
- +
- +
@@ -106,47 +106,47 @@ crackdownStatus.materialDamageDetail ne null}">
- +
- +
- + - + - +
- +
- +
- + - +
- +
@@ -160,13 +160,13 @@ fishingBoat.catchCnt ne 0}">
- +
- + - + @@ -178,7 +178,7 @@
- +
@@ -187,37 +187,37 @@
- +
- +
- +
- +
- +
- +
- +
@@ -226,40 +226,40 @@
- + - + - + - +
- + - + - +
- +
- +
- +
- + - +
- +
- + - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -366,11 +366,11 @@
- +
- +
파일명사이즈
파일명사이즈