diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp index 7b897ab0..0f9d2931 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/common/popup/fimsTotal_popup.jsp @@ -33,11 +33,11 @@ + + - - - + @@ -48,7 +48,7 @@ - + @@ -72,11 +72,11 @@
자료출처
위반일시
+ - - + - + @@ -116,11 +116,11 @@
+ - - + - + @@ -270,7 +270,7 @@

감경처리

소유주
- + @@ -304,7 +304,7 @@

서손처리

- + diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp index 959c99aa..3dfe6891 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp @@ -8,7 +8,7 @@ <%-- TODO: jquery-ui theme 업무별 적용 --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp index 6d89e962..afa9b617 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp @@ -26,7 +26,8 @@
- <c:out value="> + <%--2022.11.01 박소영 이미지 삭제--%> + <%-- <c:out value=">--%>
[] 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 38056588..79b480ed 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 @@ -4,7 +4,7 @@ -경 + ${pageTitle} diff --git a/src/main/webapp/resources/biz/common/css/index.css b/src/main/webapp/resources/biz/common/css/index.css index 81a92dc7..35b3822d 100644 --- a/src/main/webapp/resources/biz/common/css/index.css +++ b/src/main/webapp/resources/biz/common/css/index.css @@ -1,43 +1,75 @@ @charset "UTF-8"; -/*웹폰트*/ +/* +!*웹폰트*! @font-face { - font-family: 'notokr-bold'; - src: url("../webfonts/font/notoKR-Bold/notokr-bold.eot"); - src: url("../webfonts/font/notokr-bold/notokr-bold.eot?#iefix") format("embedded-opentype"), url("../webfonts/font/notoKR-Bold/notokr-bold.woff2") format("woff2"), url("../webfonts/font/notoKR-Bold/notokr-bold.woff") format("woff"), url("../webfonts/font/notoKR-Bold/notokr-bold.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + font-family: 'notokr-bold'; + src: url('../webfonts/font/notoKR-Bold/notokr-bold.eot'); + src: url('../webfonts/font/notokr-bold/notokr-bold.eot?#iefix') format('embedded-opentype'), + url('../webfonts/font/notoKR-Bold/notokr-bold.woff2') format('woff2'), + url('../webfonts/font/notoKR-Bold/notokr-bold.woff') format('woff'), + url('../webfonts/font/notoKR-Bold/notokr-bold.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} @font-face { - font-family: 'notokr-medium'; - src: url("../webfonts/font/notoKR-Medium/notokr-medium.eot"); - src: url("../webfonts/font/notoKR-Medium/notokr-medium.eot?#iefix") format("embedded-opentype"), url("../webfonts/font/notoKR-Medium/notokr-medium.woff2") format("woff2"), url("../webfonts/font/notoKR-Medium/notokr-medium.woff") format("woff"), url("../webfonts/font/notoKR-Medium/notokr-medium.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + font-family: 'notokr-medium'; + src: url('../webfonts/font/notoKR-Medium/notokr-medium.eot'); + src: url('../webfonts/font/notoKR-Medium/notokr-medium.eot?#iefix') format('embedded-opentype'), + url('../webfonts/font/notoKR-Medium/notokr-medium.woff2') format('woff2'), + url('../webfonts/font/notoKR-Medium/notokr-medium.woff') format('woff'), + url('../webfonts/font/notoKR-Medium/notokr-medium.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} @font-face { - font-family: 'notokr-regular'; - src: url("../webfonts/font/notoKR-Regular/notokr-regular.eot"); - src: url("../webfonts/font/notoKR-Regular/notokr-regular.eot?#iefix") format("embedded-opentype"), url("../webfonts/font/notoKR-Regular/notokr-regular.woff2") format("woff2"), url("../webfonts/font/notoKR-Regular/notokr-regular.woff") format("woff"), url("../webfonts/font/notoKR-Regular/notokr-regular.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + font-family: 'notokr-regular'; + src: url('../webfonts/font/notoKR-Regular/notokr-regular.eot'); + src: url('../webfonts/font/notoKR-Regular/notokr-regular.eot?#iefix') format('embedded-opentype'), + url('../webfonts/font/notoKR-Regular/notokr-regular.woff2') format('woff2'), + url('../webfonts/font/notoKR-Regular/notokr-regular.woff') format('woff'), + url('../webfonts/font/notoKR-Regular/notokr-regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + @font-face { font-family: "Nanumsquare_L"; - src: url("../webfonts/font/nanumsquare/NanumSquare_acL.eot?") format("eot"), url("../webfonts/font/nanumsquare/NanumSquare_acL.woff") format("woff"), url("../webfonts/font/nanumsquare/NanumSquare_acL.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + src: url("../webfonts/font/nanumsquare/NanumSquare_acL.eot?") format("eot"), + url("../webfonts/font/nanumsquare/NanumSquare_acL.woff") format("woff"), + url("../webfonts/font/nanumsquare/NanumSquare_acL.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +} + @font-face { font-family: "Nanumsquare_B"; - src: url("../webfonts/font/nanumsquare/NanumSquare_acB.eot?") format("eot"), url("../webfonts/font/nanumsquare/NanumSquare_acB.woff") format("woff"), url("../webfonts/font/nanumsquare/NanumSquare_acB.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + src: url("../webfonts/font/nanumsquare/NanumSquare_acB.eot?") format("eot"), + url("../webfonts/font/nanumsquare/NanumSquare_acB.woff") format("woff"), + url("../webfonts/font/nanumsquare/NanumSquare_acB.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +} + @font-face { font-family: "S-CoreDream-3Light"; - src: url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.eot?") format("eot"), url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.woff") format("woff"), url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + src: url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.eot?") format("eot"), + url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.woff") format("woff"), + url("../webfonts/font/S-CoreDream-3Light/S-CoreDream-3Light.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +} + @font-face { font-family: "S-CoreDream-5Medium"; - src: url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.eot?") format("eot"), url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.woff") format("woff"), url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.ttf") format("truetype"); - font-weight: normal; - font-style: normal; } + src: url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.eot?") format("eot"), + url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.woff") format("woff"), + url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +}*/ /* 기본 폰트 색상 설정 */ /* default */ /* white */ @@ -509,7 +541,10 @@ label { .main-banner .main_inner .mainVisual_text { position: absolute; top: 245px; - left: 181px; } + left: 181px; + font-weight: bold; + letter-spacing: -2.6px; + } .main-banner .main_inner .mainVisual_text .mainVisual_tit { font-family: "S-CoreDream-5Medium"; font-size: 48px; @@ -819,11 +854,13 @@ header { border-radius: 7px; } .title { - font-family: "S-CoreDream-5Medium"; + /*font-family: "S-CoreDream-5Medium";*/ border: 0px solid green; border-bottom: 1px solid #c3c3c3; font-size: 15px; - font-weight: bold; } + font-weight: bold; + letter-spacing: -1.6px; +} .conttitle .title { font-size: 20px !important; } @@ -863,11 +900,13 @@ header { border: none; height: auto; width: 98%; + font-weight: 600; + letter-spacing: -2.5px; text-align: left; cursor: pointer; border-bottom: 2px solid #222328; font-size: 20px; - font-family: 'notokr-bold'; } + /*font-family: 'notokr-bold'; */ } .tab-list-ui .detailList dd { position: relative; z-index: 10; @@ -915,7 +954,7 @@ header { cursor: default; border-bottom: 2px solid #222328; font-size: 20px; - font-family: 'notokr-bold'; } + /*font-family: 'notokr-bold'; */ } .tab-list-ui .detailList.sel dd { display: block; } @@ -1012,7 +1051,8 @@ header { font-size: 23px; /* font-family: 'notokr-medium'; */ padding: 12px 0px; - padding-left: 23px; } + padding-left: 23px; + } .conttitle .popup_01 { font-size: 20px; border-bottom: 2px solid #ccc; } @@ -1039,7 +1079,7 @@ header { .shipmentInfo .titleBox_02 { border: 0px solid red; font-size: 16px; - font-family: 'notokr-bold'; + /*font-family: 'notokr-bold'; */ color: #000; padding: 6px 0px; } @@ -1097,7 +1137,7 @@ header { float:left; padding:0 5px 0 0; } - } + } .newField{ .btnSearch{ position:static; @@ -1131,7 +1171,9 @@ header { background: #44539e; line-height: 24px; font-size: 11px; - color: #fff; } + color: #fff; + border-radius: 4px; + } .search .btnOpen { position: relative; display: inline-block; @@ -1158,10 +1200,13 @@ header { transform: translateY(-50%) rotate(-45deg); } .search .defalt, .search .detail_02, .search .defalt_03 { position: relative; - text-align: left; } + text-align: left; + top:6px; + } .search > .detailGroup_02 { display: none; - border-top: 1px solid #d0d0d0; } + border-top: 1px solid #d0d0d0; + } .search > .detail .detailGroup_02 > li { float: left; padding: 0 15px 5px 0; } @@ -1191,7 +1236,7 @@ header { padding: 0 15px 0 0; } .search .detailGroup_02 > li span { border: 0px solid red; - font-family: 'notokr-bold'; + /*font-family: 'notokr-bold'; */ font-size: 14px; } .search_02 { @@ -1248,7 +1293,9 @@ header { transform: translateY(-50%) rotate(-45deg); } .search_02 .defalt, .search_02 .detail_02 { position: relative; - text-align: left; } + text-align: left; + top:6px; + } .search .defalt_03 { position: relative; @@ -1259,7 +1306,8 @@ header { border-top: 1px solid #d0d0d0; } .search_02 > .detail .detailGroup_02 > li { float: left; - padding: 0 15px 5px 0; } + padding: 0 15px 5px 0; +} .search_02 > .detail .detailGroup_02 > li.width100 { width: 100%; } .search_02 > .detail .detailGroup_02 > li.last { @@ -1286,7 +1334,7 @@ header { padding: 0 15px 0 0; } .search_02 .detailGroup_02 > li span { border: 0px solid red; - font-family: 'notokr-bold'; + /*font-family: 'notokr-bold'; */ font-size: 14px; } /* ** 컨텐츠 기본 가이드 ** */ @@ -1407,7 +1455,7 @@ header { /* background: #eee; */ background: #f0f5ff; font-size: 13px; - font-family: 'notokr-bold'; + /*font-family: 'notokr-bold'; */ color: #101010; font-weight: bold; text-align: center; @@ -1462,7 +1510,7 @@ header { /* background: #eee; */ background: #f0f5ff; font-size: 13px; - font-family: 'notokr-bold'; + /*font-family: 'notokr-bold'; */ color: #101010; font-weight: bold; text-align: center; @@ -1513,13 +1561,14 @@ header { display: block; padding: 10px 0; text-align: right; + padding-top:35px; /*2021.09.24 박소영 새로추가*/ } .bottomBtnArea > .list, .topBtnArea > .list { float: left; font-size: 12px; padding-top: 18px; - font-family: 'notokr-bold'; } + /*font-family: 'notokr-bold'; */ } .centerBtnArea { display: block; @@ -1634,7 +1683,7 @@ button { float: left; font-size: 12px; padding-top: 18px; - font-family: 'notokr-bold'; } + /*font-family: 'notokr-bold'; */ } .conttitle .bottom_Btn { border: 0px solid red; @@ -1677,7 +1726,7 @@ button { padding: 15px 0px 15px 17px; font-size: 12px; cursor: default; - font-family: 'notokr-bold'; } + /*font-family: 'notokr-bold'; */} .lnb > li > span.active > a { color: #fff; } .lnb > li.sel > .toggle::after { @@ -1719,9 +1768,11 @@ button { transform: translate(-50%, -50%) rotate(90deg); } .lnb li a, .lnb li.active a, .lnb li.sel a { font-size: 16px; - letter-spacing: -0.6px; + letter-spacing: -1.6px; color: #222; - text-decoration: none; } + text-decoration: none; + font-weight: bolder; + } .lnb li a:hover, .lnb li a.focus { /*color: #ea002c;*/ } .lnb li.active a:hover, .lnb li.active a.focus { @@ -1820,16 +1871,16 @@ button { padding: 0 10px; background-color: #edf4ff; line-height: 15px; - /* .depth_04::before{ - content:''; - display:inline-block; - width:4px; - height:4px; - margin:-5px 8px 0 0; - vertical-align:middle; - background:#868686; - border-radius:50% - }*/ } + /* .depth_04::before{ + content:''; + display:inline-block; + width:4px; + height:4px; + margin:-5px 8px 0 0; + vertical-align:middle; + background:#868686; + border-radius:50% + }*/ } .lnb .dep4 > li > span { display: block; padding: 13px 5px 11px; @@ -1944,15 +1995,15 @@ button { /* ** 개인화 영역 가이드 ** */ .personalArea { - background: #ede9e7; + background: #ffffff; margin: 0; overflow: hidden; } .personalArea .infoArea { - display: inline-block; + /*display: inline-block;*/ width: 100%; - height: 80px; - margin: 0 10px; - padding: 36px 0 10px; } + /*height: 80px;*/ + /*margin: 0 10px;*/ + padding: 36px 0 25px; } .personalArea .infoArea .faceArea { float: left; position: relative; @@ -1971,12 +2022,17 @@ button { -webkit-box-shadow: 0 5px #d5d1cf; box-shadow: 0 5px #d5d1cf; } .personalArea .infoArea .txtArea { - padding: 7px 0; - color: #666; } + /*padding: 7px 0;*/ + color: #666; + text-align: center; + } .personalArea .infoArea .txtArea strong { color: #666; font-size: 14px; - font-weight: bold; } + font-weight: bold; + display: block; + padding-bottom: 15px; + } .personalArea .infoArea .txtArea em { display: block; font-style: normal; @@ -1988,20 +2044,23 @@ button { float: left; padding: 0 3px; } .personalArea .infoArea .txtArea .btnArea > li a { - padding: 4px 3px; - border-radius: 2px; - background: #444; + /*padding: 4px 3px;*/ + /*border-radius: 2px;*/ + background: #636b97; + padding:6px; font-size: 11px; color: #fff; - text-decoration: none; } + text-decoration: none; + border-radius: 4px; + } .personalArea .workArea { - background: #d0d0d0; } + background: #f5f6f7; } .personalArea .workArea button { position: relative; display: block; width: 100%; border: none; - background: #7f7f7f; + background: #4b84c1; color: #fff; } .personalArea .workArea button::before, .personalArea .workArea button::after { content: "\f0d7"; @@ -2013,7 +2072,7 @@ button { .personalArea .workArea dl { display: none; padding: 10px 10px; - color: #555; + color: #000; font-size: 12px; } .personalArea .workArea dl dt { font-weight: 700; diff --git a/src/main/webapp/resources/biz/common/css/scss/common/_webFont.scss b/src/main/webapp/resources/biz/common/css/scss/common/_webFont.scss index 5f1da49d..6bb99600 100644 --- a/src/main/webapp/resources/biz/common/css/scss/common/_webFont.scss +++ b/src/main/webapp/resources/biz/common/css/scss/common/_webFont.scss @@ -1,4 +1,5 @@ -/*웹폰트*/ +/* +!*웹폰트*! @font-face { font-family: 'notokr-bold'; src: url('../webfonts/font/notoKR-Bold/notokr-bold.eot'); @@ -67,4 +68,4 @@ url("../webfonts/font/S-CoreDream-5Medium/S-CoreDream-5Medium.ttf") format("truetype"); font-weight: normal; font-style: normal; -} \ No newline at end of file +}*/ diff --git a/src/main/webapp/resources/framework/css/cmmn/common-style.css b/src/main/webapp/resources/framework/css/cmmn/common-style.css index f4692edb..22a6f74f 100644 --- a/src/main/webapp/resources/framework/css/cmmn/common-style.css +++ b/src/main/webapp/resources/framework/css/cmmn/common-style.css @@ -466,7 +466,6 @@ label, label * {vertical-align: middle;} padding: 13px 15px; background-color: #f2f2f2; } - .search td{ font-size: 12px; line-height: 1.3; @@ -518,10 +517,13 @@ label, label * {vertical-align: middle;} .search.r2 .btn_search { border:0px solid red; width:60px; - height: 45px; + height: 30px; border-radius:4px; cursor: pointer; - vertical-align: middle; + line-height: 24px; + background:#44539e; + font-weight: 600; + } @@ -1305,14 +1307,18 @@ input:read-only { .btn { display: inline-block; margin-right: 4px; - padding: 10px 20px; + /*padding: 10px 20px;*/ text-align: center; font-size: 12px; - font-weight: bold; - color: #474747; +/* font-weight: bold; + color: #474747;*/ /*vertical-align: top;*/ cursor: pointer; border-radius: 4px; + height:30px; + padding:0 15px; + line-height: 30px; + font-width: 600; } .btn.sm { padding: 8px 14px; @@ -1701,30 +1707,34 @@ span.attachfile_btnRemove { margin: 0px 1px 0px 1px; } +/*2022.11.01 박소영 테이블 여백 수정*/ +.ui-tabs .ui-tabs-panel{ + padding: 1em 0em; +} /*======================= datepicker custom Style =======================*/ -.datepicker_wrap { - position: absolute; +/*.datepicker_wrap { + position: absolute; top: 240px; left: 345px; - width: 490px; - height: 275px; - padding: 10px; - border:1px solid #CCC; - overflow-x:hidden; - overflow-y: auto; + width: 490px; + height: 275px; + padding: 10px; + border:1px solid #CCC; + overflow-x:hidden; + overflow-y: auto; background-color: white; z-index: 1; border-radius: 5px; } .datepicker_wrap .ui-datepicker-calendar > tbody td a{ - margin-left: 10px; + margin-left: 10px; } .datepicker_wrap .datepicker_header { -/* float: right; */ +!* float: right; *! float: left; text-align: right; word-spacing: -5px; @@ -1752,7 +1762,7 @@ datepicker custom Style cursor: pointer; vertical-align: middle; } -/** Datepicker style 변경 */ +!** Datepicker style 변경 *! .ui-datepicker-header.ui-widget-header { border: 0px; background: #4d5769; @@ -1777,54 +1787,54 @@ select.ui-datepicker-year, select.ui-datepicker-year > option, select.ui-datepic color: white; } .ui-datepicker .ui-datepicker-header { - /*head-배경색*/ + !*head-배경색*! background-color: #4d5769; } .ui-datepicker th { - /*head-평일*/ + !*head-평일*! background-color: #4d5769; color: white; } .ui-datepicker th:first-child { - /*head-주말*/ + !*head-주말*! color: red; } .ui-datepicker th:last-child { - /*head-주말*/ + !*head-주말*! color: blue; } .ui-datepicker-calendar > tbody td:not(.ui-datepicker-week-end) a:not(.ui-state-active):not(.ui-state-hover):not(.ui-state-highlight) { - /*body-평일*/ + !*body-평일*! color: black; background: white; background-color: white; } .ui-datepicker-calendar > tbody td.ui-datepicker-week-end:first-child a:not(.ui-state-active):not(.ui-state-hover):not(.ui-state-highligh) { - /*body-주말*/ + !*body-주말*! color: red; background: white; background-color: white; } .ui-datepicker-calendar > tbody td.ui-datepicker-week-end:last-child a:not(.ui-state-active):not(.ui-state-hover):not(.ui-state-highligh) { - /*body-주말*/ + !*body-주말*! color: blue; background: white; background-color: white; } .ui-datepicker-calendar > tbody td a.ui-state-highlight:not(.ui-state-active):not(.ui-state-hover){ - /*body-오늘 날짜 */ + !*body-오늘 날짜 *! color: #e78f08; background: white; background-color: white; } a.ui-state-active, .ui-widget-content a.ui-state-active, .ui-widget-header a.ui-state-active { - /*body-선택한 날짜 */ + !*body-선택한 날짜 *! color: white; background: #4d5769; - background-color: #4d5769; + background-color: #4d5769; border-radius: 10px; margin-left: 21px; -} +}*/ /** //Datepicker style 변경 */ diff --git a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js index 7eef36aa..a92522c3 100644 --- a/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js +++ b/src/main/webapp/resources/framework/js/cmm/xit-tui-grid.js @@ -45,7 +45,7 @@ const customTheme = { }, row: { even: { - background: '#f3ffe3' + background: '#f2f4ff' }, hover: { background: '#ccc'