--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
... | ... | @@ -628,7 +628,7 @@ |
| 628 | 628 |
<div class="tooltip-wrap"> |
| 629 | 629 |
<div class="popup-com adr_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close" style="width: 1000px;"> |
| 630 | 630 |
<div class="tooltip-wrap"> |
| 631 |
- <div class="popup-com adr_layer adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 450px;"> |
|
| 631 |
+ <div class="popup-com adr_layer adr_popup14 adr_detail_result" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;"> |
|
| 632 | 632 |
<div class="popup_heading"> |
| 633 | 633 |
<p>주소록 상세 결과</p> |
| 634 | 634 |
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
... | ... | @@ -660,7 +660,7 @@ |
| 660 | 660 |
<p>엑셀 불러오기</p> |
| 661 | 661 |
<button type="button" class="tooltip-close" id="closeBtn" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 662 | 662 |
</div> |
| 663 |
- <div class="layer_in" style="padding: 25px 30px;"> |
|
| 663 |
+ <div class="layer_in execl_upload_layer" style="padding: 25px 30px;"> |
|
| 664 | 664 |
|
| 665 | 665 |
<!-- 엑셀입력 --> |
| 666 | 666 |
<div class="popCont current pop_more_cont" id="popCont_1"> |
... | ... | @@ -688,7 +688,7 @@ |
| 688 | 688 |
</colgroup> |
| 689 | 689 |
<tbody> |
| 690 | 690 |
<tr> |
| 691 |
- <td colspan="2" style="padding:20px 0;"> |
|
| 691 |
+ <td colspan="2" style="padding:10px 0;"> |
|
| 692 | 692 |
<div class="file_upload_wrap" style="width:100%;display:flex;"> |
| 693 | 693 |
<div class="file_add exel_upload_area"> |
| 694 | 694 |
<p><img src="/publish/images/content/file_add.png" alt="파일 붙여넣기">마우스로 엑셀파일을 여기에 끌어다 놓으세요</p> |
... | ... | @@ -710,7 +710,7 @@ |
| 710 | 710 |
<button type="button" class="btn_list_detail" data-tooltip="adr_popup14"><img src="/publish/images/search.png"></button> |
| 711 | 711 |
</p> |
| 712 | 712 |
</div> |
| 713 |
- <div class="adr_excel" style="margin-top: 13px; overflow-x:auto;"> |
|
| 713 |
+ <div class="adr_excel" style="margin-top: 10px; overflow-x:auto;"> |
|
| 714 | 714 |
<!-- thead --> |
| 715 | 715 |
<div class="adr_hd select_adr_hd msg" data-group="tableExcel"> |
| 716 | 716 |
<div style="width: 40px;"></div> |
... | ... | @@ -744,7 +744,7 @@ |
| 744 | 744 |
</div> |
| 745 | 745 |
<!--// 공통 --> |
| 746 | 746 |
|
| 747 |
- <div class="popup_btn_wrap2" style="margin: 0 auto 30px auto;"> |
|
| 747 |
+ <div class="popup_btn_wrap2"> |
|
| 748 | 748 |
<button type="button" id="btnAddrMassReg">추가</button> |
| 749 | 749 |
<button type="button" id="btnAddrMassClose" class="tooltip-close" data-focus="adr_popup01-close" data-focus-next="popup02">닫기</button> |
| 750 | 750 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -2316,7 +2316,7 @@ |
| 2316 | 2316 |
//이미지 카운트 증가시키기 |
| 2317 | 2317 |
//imgCnt ++; |
| 2318 | 2318 |
$("#imgCnt").val(Number(imgCnt)+1);
|
| 2319 |
- |
|
| 2319 |
+ $(".thumb_wrap").removeClass("none");
|
|
| 2320 | 2320 |
|
| 2321 | 2321 |
//문자 내용 상단에 이미지 이름 영역 객체 추가해주기 |
| 2322 | 2322 |
var imgPath = '<img src="' + imgSrc + '" class="thumb_img '+ editYn +'" alt="thumb1"/>'; |
... | ... | @@ -3971,13 +3971,13 @@ |
| 3971 | 3971 |
<div class="clearfix"> |
| 3972 | 3972 |
<div class="put_left short"> |
| 3973 | 3973 |
<!-- 업로드한 이미지의 썸네일 영역 --> |
| 3974 |
- <ul class="thumb_wrap liOnImg"></ul> |
|
| 3974 |
+ <ul class="thumb_wrap none liOnImg"></ul> |
|
| 3975 | 3975 |
<!-- //업로드한 이미지의 썸네일 영역 --> |
| 3976 | 3976 |
<label for="smsTxtArea" class="label"></label> |
| 3977 | 3977 |
<c:if test="${tabDision eq 'tab02'}">
|
| 3978 | 3978 |
<div class="ad_txt"><p>(광고)</p></div> |
| 3979 | 3979 |
</c:if> |
| 3980 |
- <textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea> |
|
| 3980 |
+ <textarea id="smsTxtArea" name="smsTxtArea" class="put_text" onkeyup="fnByteString($(this').val());"></textarea> |
|
| 3981 | 3981 |
<div class="text_length"> |
| 3982 | 3982 |
<c:if test="${tabDision eq 'tab02'}">
|
| 3983 | 3983 |
<div class="deny_txt"><p>무료거부 0808800858</p> </div> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
... | ... | @@ -713,7 +713,7 @@ |
| 713 | 713 |
|
| 714 | 714 |
<!-- 주소록 상세 결과 팝업 data-tooltip:adr_popup14 --> |
| 715 | 715 |
<div class="tooltip-wrap"> |
| 716 |
- <div class="popup-com adr_layer adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 450px;"> |
|
| 716 |
+ <div class="popup-com adr_layer adr_detail_result adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;"> |
|
| 717 | 717 |
<div class="popup_heading"> |
| 718 | 718 |
<p>주소록 상세 결과</p> |
| 719 | 719 |
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
--- src/main/webapp/publish/css/adrbook.css
+++ src/main/webapp/publish/css/adrbook.css
... | ... | @@ -52,6 +52,8 @@ |
| 52 | 52 |
|
| 53 | 53 |
/* 오른쪽 */ |
| 54 | 54 |
.adr1_right {width: calc(100% - 24% - 20px);}
|
| 55 |
+.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);}
|
|
| 56 |
+.adr1_right .adr_list tbody td>.addrGrpIdArea2{line-height:25px;}
|
|
| 55 | 57 |
|
| 56 | 58 |
.search_group_top2 {background-color: #f2f2f2; padding: 13px 20px 13px 20px;border: 1px solid #ccc; border-radius: 5px; margin-bottom: 20PX; position: relative;}
|
| 57 | 59 |
.search_group_top2 span {font-size: 17px; padding-right: 15px; vertical-align: middle;}
|
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -228,9 +228,9 @@ |
| 228 | 228 |
.tType1 tbody tr td.putText>div {display: flex; width: 100%;}
|
| 229 | 229 |
.tType1 tbody tr td.putText>p:last-child {color: #555; font-size: 14px; padding-top: 10px;}
|
| 230 | 230 |
.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;*/}
|
| 231 |
-.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 40px;margin:0 0 15px;border-radius: 0 0 5px 5px;}
|
|
| 231 |
+.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 28px;margin:0 0 15px;border-radius: 0 0 5px 5px;}
|
|
| 232 | 232 |
.tType1 tbody tr td.putText .put_left .text_length>div:first-child {font-size: 15px; padding-left: 10px;}
|
| 233 |
-.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 15px;right: 10px;}
|
|
| 233 |
+.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 0;right: 10px;}
|
|
| 234 | 234 |
.tType1 tbody tr td.putText .put_left .text_length p {display: inline-block;padding-right: 10px;}
|
| 235 | 235 |
.tType1 tbody tr td.putText .put_right { width: 26%; max-width: 200px; position: relative;}
|
| 236 | 236 |
.tType1 tbody tr td.putText .put_right>button {width: calc(100% - 10px); margin-left: 10px;margin-bottom: 5px;}
|
... | ... | @@ -240,7 +240,7 @@ |
| 240 | 240 |
.tType1 tbody tr td.putText .put_right .send_btnWrap button {width: 48.5%;}
|
| 241 | 241 |
.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;}
|
| 242 | 242 |
/* 단문 */ |
| 243 |
-.tType1 tbody tr td.putText .put_left.short textarea {height: 160px;margin:-5px 0 0;padding:0 5px;}
|
|
| 243 |
+.tType1 tbody tr td.putText .put_left.short textarea {height: 190px;margin:10px 0;padding:0 5px;}
|
|
| 244 | 244 |
.tType1 tbody tr td.putText .put_left.short textarea::placeholder {color: #b5b5b5;}
|
| 245 | 245 |
.tType1 tbody tr td.putText .put_left.short.on {border: 1px solid #002c9a;border-radius: 5px;background-color: #eef2f9 !important;}
|
| 246 | 246 |
/* 장문 */ |
... | ... | @@ -358,10 +358,11 @@ |
| 358 | 358 |
.tType4 tbody td .cancel_date {font-size:14px; color:#666; display: block;}
|
| 359 | 359 |
|
| 360 | 360 |
/* .thumb_wrap {position: absolute; margin-left: 20px; top: 20px; left: 0;} */
|
| 361 |
-.thumb_wrap {margin: 20px 0 0 10px;}
|
|
| 361 |
+.thumb_wrap {margin: 15px 0 0 10px;}
|
|
| 362 |
+.thumb_wrap.none{margin:0;}
|
|
| 362 | 363 |
.thumb_wrap li {margin: 0 2px; display: inline-block; position: relative;}
|
| 363 | 364 |
.thumb_wrap li>div {width: 80px; height: 80px; border-radius: 5px; overflow: hidden; box-sizing: border-box;}
|
| 364 |
-.thumb_wrap li>div img {width: 80px;}
|
|
| 365 |
+.thumb_wrap li>div img {width: 80px;height:100%;object-fit:cover;}
|
|
| 365 | 366 |
.thumb_wrap li.on>div {border: 2px solid #fbc72b;}
|
| 366 | 367 |
.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); }
|
| 367 | 368 |
.thumb_wrap li button.file_close_on {display: none;}
|
... | ... | @@ -370,7 +371,7 @@ |
| 370 | 371 |
.thumb_wrap li.on button.file_close_on {position: absolute; top: 5px; right:5px; display: block; }
|
| 371 | 372 |
.thumb_wrap li.on button.file_close_on img {margin-bottom: 0;}
|
| 372 | 373 |
/* 광고 */ |
| 373 |
-.ad_txt {margin:0 0 15px;padding:0 0 0 5px;font-weight:400;font-size:17px;}
|
|
| 374 |
+.ad_txt {margin:15px 0 0 0;padding:0 0 0 15px;font-weight:400;font-size:17px;}
|
|
| 374 | 375 |
.ad_tit {padding-bottom: 10px;}
|
| 375 | 376 |
.deny_receipt {padding-top: 10px;}
|
| 376 | 377 |
|
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
... | ... | @@ -270,11 +270,18 @@ |
| 270 | 270 |
/* .import_layer .titBox>button {height: 30px; font-size: 14px;} */
|
| 271 | 271 |
.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;}
|
| 272 | 272 |
|
| 273 |
+.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;}
|
|
| 274 |
+.execl_upload_layer .btn_list_detail img{width:calc(100% - 8px);}
|
|
| 273 | 275 |
.execl_upload_layer .file_add{height:55px;}
|
| 274 | 276 |
.execl_upload_layer .file_add img{width:23px;}
|
| 275 | 277 |
.execl_upload_layer .file_upload_wrap .btnType.c3{height:55px;}
|
| 276 | 278 |
.execl_upload_layer .popup_btn_wrap2{margin:0 auto !important;}
|
| 277 | 279 |
|
| 280 |
+/* 주소록 상세 결과 */ |
|
| 281 |
+.adr_layer.adr_popup14.adr_detail_result .table_top{display:flex;flex-wrap:wrap;flex-direction:column-reverse;align-items:flex-end;}
|
|
| 282 |
+.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;}
|
|
| 283 |
+.adr_layer.adr_popup14.adr_detail_result .table_top p span{font-weight:bold;}
|
|
| 284 |
+ |
|
| 278 | 285 |
/* TXT파일 불러오기 */ |
| 279 | 286 |
.import_layer .txt_file_title p {font-size: 20px; text-align: center; margin: 30px 0;}
|
| 280 | 287 |
.import_layer .attachedFile {text-align: center; padding: 20px 0; border-top: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?