tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kakaoFT

Browse Source
This commit is contained in:
rosewiper 2024-02-07 11:48:56 +09:00
commit 9c06409b79
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
View File

@ -4538,6 +4538,11 @@ function getMjMsgSentListAll(pageNo) {
<button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
</div>
</div>
<!-- 엔터키로 발송 체크박스 -->
<div class="use_enter">
<input type="checkbox" id="enterChk" name="enterChk">
<label for="enterChk">Enter키로 발송하기</label><!-- 예약일땐 'Enter키로 예약하기'로 변경부탁드려요 -->
</div>
<div class="rev_selected">
<div class="rev_top">
<span>날짜 :</span>
@ -4592,11 +4597,6 @@ function getMjMsgSentListAll(pageNo) {
<label for="divideTime">간격</label>
</div> -->
</div>
<!-- 엔터키로 발송 체크박스 -->
<div class="use_enter">
<input type="checkbox" id="enterChk" name="enterChk">
<label for="enterChk">Enter키로 발송하기</label>
</div>
</div>
</div>
</div>

6
src/main/webapp/publish/css/content.css
View File

@ -520,7 +520,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email
.preview_auto p {word-break: break-all;}
.preview_auto .none_txt {color: #999; font-weight: 300;}
/* 핸드폰 안에 내용 길어져서 스크롤 생길 때 */
.send_top .send_right .phone .addText {color: #002c9a;text-align: center; font-size: 14px; padding-top: 10px;}
.send_top .send_right .phone .addText {color: #002c9a;text-align: center; font-size: 14px; padding-top: 10px; margin:0 0 10px 0;}
/* 그림 문자 */
.send_top .send_right .phone .text_length2 .photo_msg_num {margin-left: 3px; float: left;}
@ -532,7 +532,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email
/* 문자 예약 */
.send_top .send_right .phone_bottom {position: absolute; bottom: 0; left: 0;}
.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0; position:relative;}
.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0; /*position:relative;*/}
.send_top .send_right .send_rev .rev_selected {background-color: #f5f5f5;padding: 15px 0 15px 10px;border: 1px solid #d6d8da;border-radius: 10px;}
.send_top .send_right .send_rev .rev_radio input[type="radio"]+label {color: #555;margin-right: 8px;}
.send_top .send_right .send_rev select+label {color: #555;font-weight: 300; font-size: 14px;}
@ -554,7 +554,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email
.send_top .send_right .send_rev .send_content .rev_radio ul li input[type=radio] + label {vertical-align:top;}
.send_top .send_right .send_rev .send_content .send_btn {display:flex;width:245px;justify-content:space-between;}
.send_top .send_right .send_rev .send_content .send_btn button {width:calc(100%/2 - 4px);height:60px;}
.send_top .send_right .send_rev .use_enter {position:absolute; padding:3px 0 0 65px; display:flex;align-items:center;}
.send_top .send_right .send_rev .use_enter {/*position:absolute;*/ padding:3px 0 8px 65px; display:flex;align-items:center;}
.send_top .send_right .send_rev .use_enter label {font-size:16px!important; padding:0 0 0 4px; font-weight:400!important;}
/* sub1 엑셀 문자(대량 전송) */