diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/XitMain2.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/XitMain2.jsp index 0b4455d9..8d425e07 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/XitMain2.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/cmm/XitMain2.jsp @@ -5,6 +5,8 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + + 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 b634059c..80139e09 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 @@ -7,6 +7,8 @@ <%@include file="/WEB-INF/jsp/framework/frameworkIncludeBase.jsp" %> + + diff --git a/src/main/webapp/resources/biz/common/css/index.css b/src/main/webapp/resources/biz/common/css/index.css index c501cfc0..ff9b3f53 100644 --- a/src/main/webapp/resources/biz/common/css/index.css +++ b/src/main/webapp/resources/biz/common/css/index.css @@ -539,70 +539,7 @@ input[type=file] { line-height: 24px; border: 1px solid #d0d0d0; box-shadow: rgba(0, 0, 0, 0.15) 1.95px 1.95px 2.6px; - /*2021.09.24 박소영 주석처리*/ - /* .defalt, - .detail{ - position:relative; - text-align:left; - } - > .detail{ - display:none; - margin:18px -20px -5px; - padding:18px 20px 0; - border-top:1px solid $border-color; - .detail > li{ - float:left; - padding:0 15px 5px 0; - &.width100{ - width:100%; - } - &.last{ - padding:0 5px 5px 0; - } - } - .title{ - float:left; - width:90px; - margin-right:-10px; - padding:0; - border-bottom:none; - line-height:24px; - font-weight:bold; - font-size:12px; - color:#666; - } - .btnSearch{ - position:absolute; - left:417px; - bottom:6px; - *bottom:7px; - &.defaltBtn{ - left:397px; - } - } - } - .defalt{ - > li{ - float:left; - padding:0 5px 0 0; - } - } - .newField{ - .btnSearch{ - position:static; - left:auto; - bottom:auto; - *bottom:auto; - } - } - .title{ - padding:0 0 4px; - font-size:18px; - font-weight:bold; - color:#333; - text-align:left; - } - }*/ + /* --- 2021.09.24 박소영 새로추가 ---*/ } .search .inputText { width: 300px; } @@ -1698,56 +1635,6 @@ input[data-fmt-type=number] { } -/* CSS그리드 */ -div.layoutWrapper { - display: grid; - 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; - background-color: #ffffff; -} -div.layoutWrapper > header { - grid-column: 2 / 3; - display: flex; - align-items: center; - height: 100%; -} -div.layoutWrapper > main { - grid-column: 2 / 3; -} -div.layoutWrapper > footer { - grid-column: 2 / 3; -} - -div.dashboard { - display: grid; - grid-template-columns : repeat(4,18rem); - grid-template-rows: repeat(auto-fill,11rem); - grid-auto-flow: row; - grid-column-gap: 10px; - grid-row-gap: 10px; -} - -div.dashboard .card { - height: 100%; -} - -div.chart-area { - grid-column: span 2; -} diff --git a/src/main/webapp/resources/biz/layout/dashboard.css b/src/main/webapp/resources/biz/layout/dashboard.css new file mode 100644 index 00000000..b6b090f4 --- /dev/null +++ b/src/main/webapp/resources/biz/layout/dashboard.css @@ -0,0 +1,16 @@ +div.dashboard { + display: grid; + grid-template-columns : repeat(4,18rem); + grid-template-rows: repeat(auto-fill,11rem); + grid-auto-flow: row; + grid-column-gap: 10px; + grid-row-gap: 10px; +} + +div.dashboard .card { + height: 100%; +} + +div.chart-area { + grid-column: span 2; +} diff --git a/src/main/webapp/resources/biz/layout/root.css b/src/main/webapp/resources/biz/layout/root.css new file mode 100644 index 00000000..c9285ced --- /dev/null +++ b/src/main/webapp/resources/biz/layout/root.css @@ -0,0 +1,35 @@ +/* CSS그리드 */ +div.layoutWrapper { + display: grid; + 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; + background-color: #ffffff; +} +div.layoutWrapper > header { + grid-column: 2 / 3; + display: flex; + align-items: center; + height: 100%; +} +div.layoutWrapper > main { + grid-column: 2 / 3; +} +div.layoutWrapper > footer { + grid-column: 2 / 3; +} \ No newline at end of file