From a5091a0b21eaa25d6f674e517800901952fdab81 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 20 Apr 2023 12:39:11 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EC=83=81=EC=9C=84div?= =?UTF-8?q?=EC=9A=94=EC=86=8C=20css=ED=81=B4=EB=9E=98=EC=8A=A4=EB=AA=85=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 --- .../tiles/biz/layout-tiles-biz-main.jsp | 3 +- .../tiles/biz/layout-tiles-biz-pop.jsp | 7 +- .../layouts/tiles/biz/layout-tiles-biz.jsp | 3 +- .../tiles/biz/layout-tiles-dashboard.jsp | 3 +- .../tiles/popup/layout-tiles-popup.jsp | 2 +- .../WEB-INF/templates/layout/layout_biz.html | 2 +- .../WEB-INF/templates/layout/layout_main.html | 2 +- .../resources/biz/common/css/iframe.css | 6 - .../resources/biz/layout/css/dashboard.css | 65 ---------- .../webapp/resources/biz/layout/css/root.css | 37 ------ .../framework/css/common/xit-core-extend.css | 114 ++++++++++++++++++ 11 files changed, 121 insertions(+), 123 deletions(-) delete mode 100644 src/main/webapp/resources/biz/common/css/iframe.css delete mode 100644 src/main/webapp/resources/biz/layout/css/dashboard.css delete mode 100644 src/main/webapp/resources/biz/layout/css/root.css diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp index f30a57bd..e1ffb7f5 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp @@ -9,7 +9,6 @@ <%@include file="/WEB-INF/jsp/framework/frameworkIncludeBase.jsp" %> - @@ -33,7 +32,7 @@ -
+
<%@include file="header.jsp"%> diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp index 44e405cf..5ef88554 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp @@ -10,15 +10,10 @@ ${pageTitle} - -
+
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp index 47644cb7..ba029d8a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp @@ -15,11 +15,10 @@ - -
+
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-dashboard.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-dashboard.jsp index 0d25ea04..9c61a4b8 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-dashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-dashboard.jsp @@ -15,11 +15,10 @@ - -
+
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/popup/layout-tiles-popup.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/popup/layout-tiles-popup.jsp index 7fdd57c4..17aff065 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/popup/layout-tiles-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/popup/layout-tiles-popup.jsp @@ -47,7 +47,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/templates/layout/layout_biz.html b/src/main/webapp/WEB-INF/templates/layout/layout_biz.html index c79fae1c..c8137a6f 100644 --- a/src/main/webapp/WEB-INF/templates/layout/layout_biz.html +++ b/src/main/webapp/WEB-INF/templates/layout/layout_biz.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/templates/layout/layout_main.html b/src/main/webapp/WEB-INF/templates/layout/layout_main.html index af7519c1..c479b41f 100644 --- a/src/main/webapp/WEB-INF/templates/layout/layout_main.html +++ b/src/main/webapp/WEB-INF/templates/layout/layout_main.html @@ -9,7 +9,7 @@ -
+
diff --git a/src/main/webapp/resources/biz/common/css/iframe.css b/src/main/webapp/resources/biz/common/css/iframe.css deleted file mode 100644 index 0fae4f6b..00000000 --- a/src/main/webapp/resources/biz/common/css/iframe.css +++ /dev/null @@ -1,6 +0,0 @@ -/*2023.03.22 iframe css 추가*/ -.iframe-wrap { - height: 100vh; - overflow-y:scroll; - padding: 15px; -} \ No newline at end of file diff --git a/src/main/webapp/resources/biz/layout/css/dashboard.css b/src/main/webapp/resources/biz/layout/css/dashboard.css deleted file mode 100644 index 4dab5030..00000000 --- a/src/main/webapp/resources/biz/layout/css/dashboard.css +++ /dev/null @@ -1,65 +0,0 @@ -div.dashboard { - display: grid; - grid-template-columns : repeat(auto-fill,minmax(145px, 145px)); - grid-template-rows: repeat(auto-fill,minmax(116px, 116px)); - justify-content: center; - grid-auto-flow: row; - grid-column-gap: 10px; - grid-row-gap: 10px; - height: 100vh; - overflow-y:scroll; - padding: 15px; -} - -@media (max-width: 1300px) { - div.dashboard { - grid-template-columns : repeat(8,minmax(145px, 145px)); - } -} - -div.dashboard .card { - height: 100%; - font-size: 12px; - font-weight: bold; -} -div.dashboard .card-header { - margin: 0; - padding: 3px; -} -div.dashboard .card-body { - margin: 0; - padding: 3px; -} -div.dashboard .card-footer { - padding: 3px; -} - -.dashboard-item-1-1 { - grid-column: span 1; - grid-row: span 1; -} - -.dashboard-item-2-1 { - grid-column: span 2; - grid-row: span 1; -} - -.dashboard-item-1-2 { - grid-column: span 1; - grid-row: span 2; -} - -.dashboard-item-2-2 { - grid-column: span 2; - grid-row: span 2; -} - -.dashboard-item-4-2 { - grid-column: span 4; - grid-row: span 2; -} - -.dashboard-item-4-3 { - grid-column: span 4; - grid-row: span 3; -} \ No newline at end of file diff --git a/src/main/webapp/resources/biz/layout/css/root.css b/src/main/webapp/resources/biz/layout/css/root.css deleted file mode 100644 index e94c534d..00000000 --- a/src/main/webapp/resources/biz/layout/css/root.css +++ /dev/null @@ -1,37 +0,0 @@ -/* CSS그리드 */ -div.layoutWrapper { - display: grid; - grid-template-columns: min-content auto min-content; - grid-template-rows : 2.2rem minmax(27rem,54rem) 2.2rem; - grid-auto-flow: column; - grid-column-gap: 10px; - height: 100%; - transition: all 1s; -} - - -div.layoutWrapper > nav { - grid-area : 1 / 1 / 4 / 2; - background-color: #ffffff; -} -div.layoutWrapper > header { - grid-area : 1 / 2 / 2 / 4; - display: flex; - align-items: center; - height: 100%; -} -div.layoutWrapper > main { - margin-right: 3rem; - grid-area : 2 / 2 / 3 / 4; -} - -div.layoutWrapper > footer { - grid-area : 3 / 2 / 4 / 4; -} - -div.layoutWrapper > aside { - background-color: white; - border: 1px solid black; - z-index:1; - grid-area : 2 / 3 / 3 / 4; -} \ No newline at end of file diff --git a/src/main/webapp/resources/framework/css/common/xit-core-extend.css b/src/main/webapp/resources/framework/css/common/xit-core-extend.css index 60dd439c..9bf70d99 100644 --- a/src/main/webapp/resources/framework/css/common/xit-core-extend.css +++ b/src/main/webapp/resources/framework/css/common/xit-core-extend.css @@ -1,3 +1,117 @@ +/* 최상위 태그 */ +.wrapper-layout { + display: grid; + grid-template-columns: min-content auto min-content; + grid-template-rows : 2.2rem minmax(27rem,54rem) 2.2rem; + grid-auto-flow: column; + grid-column-gap: 10px; + height: 100%; + transition: all 1s; +} + + +.wrapper-layout > nav { + grid-area : 1 / 1 / 4 / 2; + background-color: #ffffff; +} +.wrapper-layout > header { + grid-area : 1 / 2 / 2 / 4; + display: flex; + align-items: center; + height: 100%; +} +.wrapper-layout > main { + margin-right: 3rem; + grid-area : 2 / 2 / 3 / 4; +} + +.wrapper-layout > footer { + grid-area : 3 / 2 / 4 / 4; +} + +.wrapper-layout > aside { + background-color: white; + border: 1px solid black; + z-index:1; + grid-area : 2 / 3 / 3 / 4; +} + +.wrapper-dashboard { + display: grid; + grid-template-columns : repeat(auto-fill,minmax(145px, 145px)); + grid-template-rows: repeat(auto-fill,minmax(116px, 116px)); + justify-content: center; + grid-auto-flow: row; + grid-column-gap: 10px; + grid-row-gap: 10px; + height: 100vh; + overflow-y:scroll; + padding: 15px; +} + +@media (max-width: 1300px) { + .wrapper-dashboard { + grid-template-columns : repeat(8,minmax(145px, 145px)); + } +} + +.wrapper-dashboard .card { + height: 100%; + font-size: 12px; + font-weight: bold; +} +.wrapper-dashboard .card-header { + margin: 0; + padding: 3px; +} +.wrapper-dashboard .card-body { + margin: 0; + padding: 3px; +} +.wrapper-dashboard .card-footer { + padding: 3px; +} + +.dashboard-item-1-1 { + grid-column: span 1; + grid-row: span 1; +} + +.dashboard-item-2-1 { + grid-column: span 2; + grid-row: span 1; +} + +.dashboard-item-1-2 { + grid-column: span 1; + grid-row: span 2; +} + +.dashboard-item-2-2 { + grid-column: span 2; + grid-row: span 2; +} + +.dashboard-item-4-2 { + grid-column: span 4; + grid-row: span 2; +} + +.dashboard-item-4-3 { + grid-column: span 4; + grid-row: span 3; +} + +.wrapper-list { + height: 100vh; + overflow-y:scroll; + padding: 15px; +} + +.wrapper-pop { + padding: 5px 20px 5px 20px; +} + /* 조회조건 영역 */ .container-search { clear: both;