diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp index 60ce67ce..30c96469 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -45,17 +45,17 @@ function footerSiteLinkPageGo (){
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index b4ef8ff8..d53597a6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -769,8 +769,8 @@ $(document).ready(function(){ onclick="fncAplctPopup('','','','10','select' ,'','','' )" title="팝업 열림">신청 --%> - diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 6fe1f1df..a3134c86 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -688,12 +688,13 @@ duet-date-picker *:focus{outline: auto !important;} .agree_wrap .agree_text {width: 100%;height: 245px; padding: 20px; border: 1px solid #d5d5d5; box-sizing: border-box; color: #666; line-height: 1.5; font-family: 'Noto Sans KR', sans-serif; font-weight: 300; font-size: 16px; overflow-y: scroll;} .agree_wrap .agree_text::-webkit-scrollbar { width: 4px;} .agree_wrap .agree_text::-webkit-scrollbar-thumb {background-color: #d5d5d5;border-radius: 5px;} -.agree_wrap .agree_text pre {line-height: 1.5;} +.agree_wrap .agree_text pre {font-size: 16px; line-height: 1.5;white-space: break-spaces;} .agree_wrap table {width: 100%; margin: 15px 0; font-size: 16px; } .agree_wrap table thead th {background-color: #f5f5f5; height: 40px; border-top: 2px solid #000; border-bottom: 1px solid #d5d5d5; text-align: center; vertical-align: middle; color: #555; font-weight: 400;} .agree_wrap table tbody th {color: #555; font-weight: 400; text-align: left;} .agree_wrap table tbody th, .agree_wrap table tbody td {height: 50px; padding: 0 20px; border-bottom: 1px solid #d5d5d5; vertical-align: middle; letter-spacing: -1px;} .agree_wrap .agree_chx {background-color: #f5f5f5; border-radius: 5px; padding: 16px 20px; margin-top: 8px; margin-bottom: 40px; box-sizing: border-box;} +.agree_wrap .agree_chx label{margin:0 0 0 6px;} /* file table */ .file_wrap{width: 100%; margin-top: 10px; border: 1px solid #d5d5d5; border-radius: 5px; overflow: hidden;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css index c3390b9b..05f55cef 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/popup.css +++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css @@ -53,7 +53,7 @@ .pop_tb_type01>table>tbody>tr>th p {line-height: 1.3;} .pop_tb_type01>table>tbody>tr>td{padding: 10px; height: 55px; font-size:1.5rem; font-weight: 300; color: #555; vertical-align: middle; line-height: 1.4;} .pop_tb_type01>table>tbody>tr>td textarea {width: 100%; height: 80px; font-size: 1.5rem; padding: 10px 15px; box-sizing: border-box;} -.pop_tb_type01>table>tbody>tr>td button {font-size: 1.5rem; height: 35px; padding: 0 15px;} +.pop_tb_type01>table>tbody>tr>td button {font-size: 1.5rem; height: 32px; padding: 0 15px;border-radius:5px; vertical-align: middle;} .pop_tb_type01>table>tbody>tr>td .duet-date__nav button{padding: 0; height: 35px;} .pop_tb_type01>table>tbody>tr>td .file_cf {margin: 5px 0 0 0; font-size: 1.5rem;} diff --git a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js index cce745e8..027c82a4 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js +++ b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js @@ -309,6 +309,23 @@ function commonPopLayerClose() { $("[data-focus=list_popup_close]").trigger("click"); } +function commonPopLayerClose(maskYn, popClass){ + // maskYn - 마스크 유무 + // popClass - 팝업의 클래스 (공통적인 클래스 말고 고유 클래스 추가, id는 혹시나 개발팀 사용할까봐 클래스 이용) + + if(maskYn == "N"){ + $(".mask").hide(); + $("."+popClass).find(".tooltip-close").trigger("click"); + }else{ + if(popClass != ""){ + // 팝업이 닫히고 다른팝업이 열리는 경우 + $(".mask").show(); + $("."+popClass).hide(); + } + + } +} + function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) { alert("12"); if (popupwidth > screen.width)