diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp index 50440dc8..5ab00438 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp @@ -21,17 +21,14 @@ " /> " /> " /> - - " /> - " /> - " /> + " /> + " /> + " /> - " /> - - "/> + " /> diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp index 8d555c79..799c50e3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp @@ -21,17 +21,15 @@ " /> " /> " /> - - " /> - " /> - " /> + " /> + " /> + " /> - " /> - - "/> + + " /> ?${ver}" /> diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp index 82b8cfa6..91f750dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp @@ -16,15 +16,12 @@ - - - + + + - - - " /> diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp index 7bed4564..06d8c9a3 100644 --- a/src/main/webapp/WEB-INF/jsp/include/head.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp @@ -23,18 +23,15 @@ " /> - " /> - " /> - " /> + " /> + " /> + " /> + " /> " /> " /> - " /> - - - "/> " /> diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index 73796598..13ad287d 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -
+ diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 75b6848d..02546190 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -24,20 +24,15 @@ " /> " /> - " /> - " /> - " /> - - - " /> - " /> - - "/> + " /> + " /> - " /> " /> - + + " /> + " /> +
diff --git a/src/main/webapp/resources/css/fims/cmmn/cmmn.css b/src/main/webapp/resources/css/fims/cmmn/cmmn.css deleted file mode 100644 index cdb66514..00000000 --- a/src/main/webapp/resources/css/fims/cmmn/cmmn.css +++ /dev/null @@ -1,39 +0,0 @@ -@charset "UTF-8"; - -body:not(.root-privacy-on) td.privacy-cell span:nth-child(1){ - display:block; -} - -body:not(.root-privacy-on) td.privacy-cell span:nth-child(2){ - display:none; -} - -body.root-privacy-on td.privacy-cell span:nth-child(1){ - display:none; -} -body.root-privacy-on td.privacy-cell span:nth-child(2){ - display:block; -} - - -caption { - display: none; -} - -/* 필수 항목 캡션 */ -label.required:after { - content: '*'; - color: red; -} - -input[type=text]:disabled, input[type=text]:read-only { - background-color: #eceef1; -} - -input[data-fmt-type=number] { - text-align: right; - padding-right: 10px; -} -input[data-fmt-type=time], input[data-fmt-type=day] { - -} diff --git a/src/main/webapp/resources/css/styles.css b/src/main/webapp/resources/css/styles.css deleted file mode 100644 index 4c801d81..00000000 --- a/src/main/webapp/resources/css/styles.css +++ /dev/null @@ -1,18 +0,0 @@ -@CHARSET "UTF-8"; - -*[onclick], *[href] {cursor:pointer;} - -.hidden {display:none;} - -.wait { - position:fixed; top:35%; left:50%; - filter:alpha(opacity=50); -moz-opacity:0.5; opacity:0.5; - z-index:99999; - display:none; -} - -.current-row {background-color:rgba(105, 108, 255, 0.16);} - -.table th {font-size:1rem;} - -.col-form-label {font-size:1rem;} \ No newline at end of file diff --git a/src/main/webapp/resources/css/fims/cmmn/xit-core.css b/src/main/webapp/resources/css/xit-core.css similarity index 99% rename from src/main/webapp/resources/css/fims/cmmn/xit-core.css rename to src/main/webapp/resources/css/xit-core.css index 1502b7cd..b6f6ef03 100644 --- a/src/main/webapp/resources/css/fims/cmmn/xit-core.css +++ b/src/main/webapp/resources/css/xit-core.css @@ -101,6 +101,29 @@ } } + +*[onclick], *[href] { + cursor:pointer !important; +} + +.hidden { + display:none !important; +} + +[hidden] { + display: none !important; +} + +.wait { + position:fixed; + top:35%; + left:50%; + filter:alpha(opacity=50); + -moz-opacity:0.5; + opacity:0.5; + z-index:99999; +} + body { margin: 0; font-family: var(--bs-body-font-family); @@ -305,6 +328,7 @@ table { } caption { + display: none; padding-top: 0.625rem; padding-bottom: 0.625rem; color: #a1acb8; @@ -331,6 +355,12 @@ label { display: inline-block; } +/* 필수 항목 캡션 */ +label.required:after { + content: '*'; + color: red; +} + button { border-radius: 0; } @@ -362,6 +392,21 @@ select { select { word-wrap: normal; } + +input[type=text]:disabled, +input[type=text]:read-only { + background-color: #eceef1; +} + +input[data-fmt-type=number] { + text-align: right; + padding-right: 10px; +} +input[data-fmt-type=time], +input[data-fmt-type=day] { + +} + select:disabled { opacity: 1; } @@ -431,14 +476,7 @@ legend + * { -webkit-appearance: textfield; } -/* rtl:raw: -[type="tel"], -[type="url"], -[type="email"], -[type="number"] { - direction: ltr; -} -*/ + ::-webkit-search-decoration { -webkit-appearance: none; } @@ -469,9 +507,7 @@ progress { vertical-align: baseline; } -[hidden] { - display: none !important; -} + .lead { font-size: 1.0546875rem; @@ -6854,9 +6890,14 @@ a.invert-bg-dark:hover, a.invert-bg-dark:focus { display: inline-table; } } + +.current-row { + background-color:rgba(105, 108, 255, 0.16); +} + .table th { text-transform: uppercase; - font-size: 0.75rem; + font-size: 1rem; letter-spacing: 1px; } .table:not(.table-dark) th { diff --git a/src/main/webapp/resources/css/fims/cmmn/xit-extend.css b/src/main/webapp/resources/css/xit-extend.css similarity index 98% rename from src/main/webapp/resources/css/fims/cmmn/xit-extend.css rename to src/main/webapp/resources/css/xit-extend.css index 7291bafd..aeaf42eb 100644 --- a/src/main/webapp/resources/css/fims/cmmn/xit-extend.css +++ b/src/main/webapp/resources/css/xit-extend.css @@ -817,3 +817,21 @@ select.option-style-select > option[value='BLACK']{ color: var(--pdf-black);back .fit-contain { object-fit: contain; } + + + +body:not(.root-privacy-on) td.privacy-cell span:nth-child(1){ + display:block; +} + +body:not(.root-privacy-on) td.privacy-cell span:nth-child(2){ + display:none; +} + +body.root-privacy-on td.privacy-cell span:nth-child(1){ + display:none; +} +body.root-privacy-on td.privacy-cell span:nth-child(2){ + display:block; +} + diff --git a/src/main/webapp/resources/css/fims/cmmn/xit-layout.css b/src/main/webapp/resources/css/xit-layout.css similarity index 100% rename from src/main/webapp/resources/css/fims/cmmn/xit-layout.css rename to src/main/webapp/resources/css/xit-layout.css diff --git a/src/main/webapp/resources/html/pdf.html b/src/main/webapp/resources/html/pdf.html index 917318b4..f44f2e58 100644 --- a/src/main/webapp/resources/html/pdf.html +++ b/src/main/webapp/resources/html/pdf.html @@ -14,15 +14,13 @@ - - - + + + - - diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index 599ff507..32be90d6 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -93,9 +93,9 @@ function uuid() { function wait(show) { if (show == false) - $(".wait").hide(); + $(".wait").attr("hidden","hidden"); else - $(".wait").show(); + $(".wait").removeAttr("hidden"); } var dialog = {