From b23c13710fb7923623b4272e3fdbf7717bc597af Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 14 Apr 2023 10:10:25 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?= =?UTF-8?q?=EC=97=90=20=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tiles/biz/layout-tiles-biz-main.jsp | 12 ++++++++- .../WEB-INF/templates/layout/layout_main.html | 2 +- .../resources/biz/common/css/bizMain.css | 9 +++++++ .../resources/biz/common/js/defaultUI.js | 14 +++++++++-- .../webapp/resources/biz/layout/css/root.css | 25 ++++++++++--------- .../framework/css/common/xit-core-extend.css | 4 +++ .../framework/css/common/xit-core.css | 5 ++++ 7 files changed, 55 insertions(+), 16 deletions(-) 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 bcb07f8c..5b47a8bd 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 @@ -24,7 +24,7 @@ -
+
<%@include file="header.jsp"%> @@ -40,6 +40,16 @@ + + <%@include file="footer.jsp"%>
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 1a28abc3..af7519c1 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/bizMain.css b/src/main/webapp/resources/biz/common/css/bizMain.css index 7d2a3918..21a7978b 100644 --- a/src/main/webapp/resources/biz/common/css/bizMain.css +++ b/src/main/webapp/resources/biz/common/css/bizMain.css @@ -135,3 +135,12 @@ letter-spacing: -0.6px; padding: 6px 10px 5px 10px; } + + +.fastmenu-close { + width: 3rem; +} + +.fastmenu-open { + width: 16.25rem; +} \ No newline at end of file diff --git a/src/main/webapp/resources/biz/common/js/defaultUI.js b/src/main/webapp/resources/biz/common/js/defaultUI.js index 876c0e88..2cfdce5a 100644 --- a/src/main/webapp/resources/biz/common/js/defaultUI.js +++ b/src/main/webapp/resources/biz/common/js/defaultUI.js @@ -6,12 +6,22 @@ $(document).ready(function(){ if(eHasClass==true){ $( "header, button.hamberger").removeClass('active'); - document.querySelector('.layoutWrapper').classList.replace('hamberger-open', 'hamberger-close'); document.querySelector('#sneatMenu').classList.add("menu-collapsed"); }else{ $( "header, button.hamberger").addClass('active'); document.querySelector('#sneatMenu').classList.remove("menu-collapsed"); - document.querySelector('.layoutWrapper').classList.replace('hamberger-close', 'hamberger-open'); + } + }); + + $( "#favorites" ).on( "click", function() { + var e= $('#fastMenu'); + + var eHasClass=e.hasClass('fastmenu-open'); + + if(eHasClass==true){ + document.querySelector('#fastMenu').classList.replace('fastmenu-open', 'fastmenu-close'); + }else{ + document.querySelector('#fastMenu').classList.replace('fastmenu-close', 'fastmenu-open'); } }); diff --git a/src/main/webapp/resources/biz/layout/css/root.css b/src/main/webapp/resources/biz/layout/css/root.css index c9285ced..6fe6d0dc 100644 --- a/src/main/webapp/resources/biz/layout/css/root.css +++ b/src/main/webapp/resources/biz/layout/css/root.css @@ -1,35 +1,36 @@ /* CSS그리드 */ div.layoutWrapper { display: grid; + grid-template-columns: fit-content(16.25rem) auto fit-content(16.25rem); grid-template-rows : 2.2rem minmax(27rem,54rem) 2.2rem; grid-auto-flow: column; grid-column-gap: 10px; height: 100%; -} -div.layoutWrapper.hamberger-open { - grid-template-columns: 16.25rem auto; transition: all 1s; } -div.layoutWrapper.hamberger-close { - grid-template-columns: fit-content(16.25rem) auto; - transition: all 1s; -} div.layoutWrapper > nav { - grid-row: 1 / 4; - grid-column: 1 / 2; + grid-area : 1 / 1 / 4 / 2; background-color: #ffffff; } div.layoutWrapper > header { - grid-column: 2 / 3; + grid-area : 1 / 2 / 2 / 4; display: flex; align-items: center; height: 100%; } div.layoutWrapper > main { - grid-column: 2 / 3; + margin-right: 3rem; + grid-area : 2 / 2 / 3 / 4; } + div.layoutWrapper > footer { - grid-column: 2 / 3; + grid-area : 3 / 2 / 4 / 4; +} + +div.layoutWrapper > aside { + 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 3f2c3353..6ca4feba 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 @@ -95,6 +95,10 @@ --bs-btn-hover-bg:#676767; } +.btn-square { + aspect-ratio: 1 / 1 !important; +} + .btn-search { --bs-btn-color: #fff; --bs-btn-bg: #44539e; diff --git a/src/main/webapp/resources/framework/css/common/xit-core.css b/src/main/webapp/resources/framework/css/common/xit-core.css index a1531fc0..ed9cbbf8 100644 --- a/src/main/webapp/resources/framework/css/common/xit-core.css +++ b/src/main/webapp/resources/framework/css/common/xit-core.css @@ -11836,6 +11836,11 @@ button.list-group-item-gray.active { color: #fff !important; } +.text-orange { + --bs-text-opacity: 1; + color: orange !important; +} + .text-body { --bs-text-opacity: 1; color: #697a8d !important;