From 1c10fbbba690d2287e43b67b0dc777059341e03f Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 24 Dec 2024 16:52:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2024/12/24=20=EC=97=91=EC=85=80=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0=20=EC=83=81=EC=84=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=ED=81=AC=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp | 10 +++++----- .../WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp | 6 +++--- .../jsp/web/msgdata/include/msgDataIncludeExcel.jsp | 2 +- src/main/webapp/publish/css/adrbook.css | 2 ++ src/main/webapp/publish/css/content.css | 13 +++++++------ src/main/webapp/publish/css/popupLayer.css | 7 +++++++ 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index 32456255..76f490fb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -628,7 +628,7 @@
-
+

주소록 상세 결과

@@ -660,7 +660,7 @@

엑셀 불러오기

-
+
@@ -688,7 +688,7 @@ - +

파일 붙여넣기마우스로 엑셀파일을 여기에 끌어다 놓으세요

@@ -710,7 +710,7 @@

-
+
@@ -744,7 +744,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index 4d200f88..dca7d34b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -2316,7 +2316,7 @@ function imageControl(obj, editYn, imageName, imgId) { //이미지 카운트 증가시키기 //imgCnt ++; $("#imgCnt").val(Number(imgCnt)+1); - + $(".thumb_wrap").removeClass("none"); //문자 내용 상단에 이미지 이름 영역 객체 추가해주기 var imgPath = 'thumb1'; @@ -3971,13 +3971,13 @@ function getMjMsgSentListAll(pageNo) {
-
    +

      (광고)

       - +

      무료거부 0808800858

      diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp index b62125ff..f9e00b83 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp @@ -713,7 +713,7 @@ $(document).on('click', '#errorExcelBtn', function() {
      -
      +

      주소록 상세 결과

      diff --git a/src/main/webapp/publish/css/adrbook.css b/src/main/webapp/publish/css/adrbook.css index 3271cb1c..ee0b6e59 100644 --- a/src/main/webapp/publish/css/adrbook.css +++ b/src/main/webapp/publish/css/adrbook.css @@ -52,6 +52,8 @@ button.group_move i {background-image: url(/publish/images/content/adress_inters /* 오른쪽 */ .adr1_right {width: calc(100% - 24% - 20px);} +.adr1_right .adr_list .selType2{height:29px;margin:0;padding:0 25px 0 8px;font-size:15px;background-size:12px;background-position-y:calc(50% + 1px);} +.adr1_right .adr_list tbody td>.addrGrpIdArea2{line-height:25px;} .search_group_top2 {background-color: #f2f2f2; padding: 13px 20px 13px 20px;border: 1px solid #ccc; border-radius: 5px; margin-bottom: 20PX; position: relative;} .search_group_top2 span {font-size: 17px; padding-right: 15px; vertical-align: middle;} diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 326c4684..fd1cfd19 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -228,9 +228,9 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .tType1 tbody tr td.putText>div {display: flex; width: 100%;} .tType1 tbody tr td.putText>p:last-child {color: #555; font-size: 14px; padding-top: 10px;} .tType1 tbody tr td.putText .put_left {float: left;width: calc(100% - 26%); min-width: 420px; padding: 0 10px; border:1px solid #f2f2f2;box-sizing: border-box; border-radius: 5px; background-color: #f2f2f2; position: relative; /*max-height: 300px;*/} -.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 40px;margin:0 0 15px;border-radius: 0 0 5px 5px;} +.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 28px;margin:0 0 15px;border-radius: 0 0 5px 5px;} .tType1 tbody tr td.putText .put_left .text_length>div:first-child {font-size: 15px; padding-left: 10px;} -.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 15px;right: 10px;} +.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 0;right: 10px;} .tType1 tbody tr td.putText .put_left .text_length p {display: inline-block;padding-right: 10px;} .tType1 tbody tr td.putText .put_right { width: 26%; max-width: 200px; position: relative;} .tType1 tbody tr td.putText .put_right>button {width: calc(100% - 10px); margin-left: 10px;margin-bottom: 5px;} @@ -240,7 +240,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .tType1 tbody tr td.putText .put_right .send_btnWrap button {width: 48.5%;} .tType1 tbody tr td.putText textarea {height: 160px; border: none;margin-bottom: -3px;;border-radius: 5px 5px 0 0;outline: 0;background-color: transparent; font-size: 15px;} /* 단문 */ -.tType1 tbody tr td.putText .put_left.short textarea {height: 160px;margin:-5px 0 0;padding:0 5px;} +.tType1 tbody tr td.putText .put_left.short textarea {height: 190px;margin:10px 0;padding:0 5px;} .tType1 tbody tr td.putText .put_left.short textarea::placeholder {color: #b5b5b5;} .tType1 tbody tr td.putText .put_left.short.on {border: 1px solid #002c9a;border-radius: 5px;background-color: #eef2f9 !important;} /* 장문 */ @@ -358,10 +358,11 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .tType4 tbody td .cancel_date {font-size:14px; color:#666; display: block;} /* .thumb_wrap {position: absolute; margin-left: 20px; top: 20px; left: 0;} */ -.thumb_wrap {margin: 20px 0 0 10px;} +.thumb_wrap {margin: 15px 0 0 10px;} +.thumb_wrap.none{margin:0;} .thumb_wrap li {margin: 0 2px; display: inline-block; position: relative;} .thumb_wrap li>div {width: 80px; height: 80px; border-radius: 5px; overflow: hidden; box-sizing: border-box;} -.thumb_wrap li>div img {width: 80px;} +.thumb_wrap li>div img {width: 80px;height:100%;object-fit:cover;} .thumb_wrap li.on>div {border: 2px solid #fbc72b;} .thumb_wrap li button.file_close {position: absolute; top: 5px; right:5px; width: 20px; height: 20px; border: 1px solid #dbdbdb; border-radius: 50%; background-color: rgba(0,0,0,0.25); } .thumb_wrap li button.file_close_on {display: none;} @@ -370,7 +371,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .thumb_wrap li.on button.file_close_on {position: absolute; top: 5px; right:5px; display: block; } .thumb_wrap li.on button.file_close_on img {margin-bottom: 0;} /* 광고 */ -.ad_txt {margin:0 0 15px;padding:0 0 0 5px;font-weight:400;font-size:17px;} +.ad_txt {margin:15px 0 0 0;padding:0 0 0 15px;font-weight:400;font-size:17px;} .ad_tit {padding-bottom: 10px;} .deny_receipt {padding-top: 10px;} diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index 1b44ce99..26d4cae4 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -270,11 +270,18 @@ /* .import_layer .titBox>button {height: 30px; font-size: 14px;} */ .import_layer .titBox button.excel_btn i {background-image: url(/publish/images/content/excel_img.png); width: 17px; height: 15px; margin: 0 5px 2px 0;} +.execl_upload_layer .btn_list_detail{display:inline-flex;width:24px;height:24px;margin:-2px 0 0 0;border:1px solid #a5a5a5;border-radius:5px;justify-content:center;align-items:center;} +.execl_upload_layer .btn_list_detail img{width:calc(100% - 8px);} .execl_upload_layer .file_add{height:55px;} .execl_upload_layer .file_add img{width:23px;} .execl_upload_layer .file_upload_wrap .btnType.c3{height:55px;} .execl_upload_layer .popup_btn_wrap2{margin:0 auto !important;} +/* 주소록 상세 결과 */ +.adr_layer.adr_popup14.adr_detail_result .table_top{display:flex;flex-wrap:wrap;flex-direction:column-reverse;align-items:flex-end;} +.adr_layer.adr_popup14.adr_detail_result .table_top p{width:100%;background:#f4f5f6;padding:8px;box-sizing:border-box;border-radius:5px;margin:10px 0 0 0;} +.adr_layer.adr_popup14.adr_detail_result .table_top p span{font-weight:bold;} + /* TXT파일 불러오기 */ .import_layer .txt_file_title p {font-size: 20px; text-align: center; margin: 30px 0;} .import_layer .attachedFile {text-align: center; padding: 20px 0; border-top: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;} From fe1d98d656b5d7382f6f2d063e2e2126891f648b Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 24 Dec 2024 17:31:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?24/12/24=20=EB=AC=B8=EC=9E=90=20=EC=A0=84?= =?UTF-8?q?=EC=86=A1=20>=20=EB=82=B4=EC=9A=A9=20=EA=B0=84=EA=B2=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/content.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index fd1cfd19..4ba6e3cb 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -238,7 +238,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .tType1 tbody tr td.putText button .qmMark {background-image: url(/publish/images/content/qmIcon_s.png); width: 19px; height: 19px; margin-left: 5px; margin-top: -2px;} .tType1 tbody tr td.putText .put_right .send_btnWrap {position: absolute;bottom: 0;right:0;width: calc(100% - 10px);} .tType1 tbody tr td.putText .put_right .send_btnWrap button {width: 48.5%;} -.tType1 tbody tr td.putText textarea {height: 160px; border: none;margin-bottom: -3px;;border-radius: 5px 5px 0 0;outline: 0;background-color: transparent; font-size: 15px;} +.tType1 tbody tr td.putText textarea {height: 160px; border: none;margin: 8px 0;padding:0 15px;border-radius: 5px 5px 0 0;outline: 0;background-color: transparent; font-size: 15px;} /* 단문 */ .tType1 tbody tr td.putText .put_left.short textarea {height: 190px;margin:10px 0;padding:0 5px;} .tType1 tbody tr td.putText .put_left.short textarea::placeholder {color: #b5b5b5;} @@ -1816,6 +1816,8 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .fax_content .file_right button{width: 100%; max-width: 100%; margin: 0 0 4px 0;} .fax_content .file_right p{width: 100%; text-align: right; margin: 20px 0 0 0;} .fax_content .receipt_num_input{width: calc(100% - 300px); max-width: 340px;} +.fax_content .receipt_num_top{align-items:center;} +.fax_content .receipt_num_top #callTo+.btnType6{margin:0 8px;} .fax_content .list_body_wrap{max-height: calc(100% - 37px); overflow: auto;} /* .fax_content .final_wrap{display: flex; margin: 20px 0;} */ .fax_content .final_wrap{margin: 20px 0;}