Merge branch 'master' into kakaoFT

src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp

@@ -3259,7 +3259,7 @@ function getMjMsgSentListAll(pageNo) {
 	<div class="tooltip-wrap">
 		<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;">
 			<div class="popup_heading">
-				<p>후보자 등록정보</p>
+				<p>후보자 등록</p>
 				<button type="button" class="tooltip-close" data-focus="candidate_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
 			

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

@@ -3489,7 +3489,7 @@ function getMjMsgSentListAll(pageNo) {
 	<div class="tooltip-wrap">
 		<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;">
 			<div class="popup_heading">
-				<p>후보자 등록정보</p>
+				<p>후보자 등록</p>
 				<button type="button" class="tooltip-close" data-focus="candidate_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
 			
@@ -3940,7 +3940,7 @@ function getMjMsgSentListAll(pageNo) {
 						<p class="cdpop_title tw_title"><i class="tw_title05_icon"></i>예약문자 발송하기</p>
 						<div class="tw_con">
 							<ul>
-								<li class="te">- 선택한 20건 문자의 발송이 예약되고 받는 사람 목록에 있는 다음 20건이 자동으로 화면에 표시됩니다.
+								<li class="te">- 선택한 20건 문자의 발송이 예약되고, 받는 사람 목록에 있는 다음 20건이 자동으로 화면에 표시됩니다.
 									<ul class="sub_li" style="margin-top: 5px;">
 										<li>① 예약 라디오 버튼을 클릭합니다.</li>
 										<li>② 예약일자 및 시간을 선택합니다.</li>

src/main/webapp/publish/css/content.css

@@ -621,11 +621,11 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .sub .election .receipt_number_table_wrap .put_right .receipt_info .btn_reset i{display:inline-block;width:15px;height:13px;margin:-1px 2px 0 0;background:url(/publish/images/icon_reset.png) no-repeat center center;}
 .sub .election .list_bottom{display:flex;width:100%;align-items:center;justify-content:space-between;padding:0 0 10px 0;}
 .sub .election .list_bottom .pagination{display:inline-flex;width:auto;margin:0;justify-content:flex-start;}
-.sub .election .list_bottom .pagination button{height:32px;}
+.sub .election .list_bottom .pagination button{display:inline-flex;align-items:center;justify-content:center;height:32px;}
 .sub .election .list_bottom .list_bottom_right{float:none;display:inline-flex;justify-content:flex-end;}
-.sub .election .list_bottom .list_bottom_right button{height:32px;padding:0 13px;font-weight:400 !important;}
+.sub .election .list_bottom .list_bottom_right button{width:95px;height:32px;font-size:14px;padding:0 2px;font-weight:400 !important;}
 .sub .election .list_bottom .list_bottom_right>button{margin:0 4px 0 0;}
-.sub .election .list_bottom .list_bottom_right .btn_yellow{display:inline-flex;align-items:center;padding:0 10px;}
+.sub .election .list_bottom .list_bottom_right .btn_yellow{display:inline-flex;align-items:center;justify-content:center;padding:0 2px;}
 .sub .election .list_bottom .list_bottom_right .btn_yellow i.qmMark{background:url(/publish/images/content/qmIcon_black.png) no-repeat center;margin:0 0 0 2px;}
 
 /* 2023/12/07 선거문자 - 20건문자(수동문자) 전송 추가 table에서 ul로 변경 */
@@ -2175,8 +2175,8 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 	
 	/* 선거문자 */
 	.sub .election .list_bottom{width:100%;}
-	.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right button{letter-spacing:-1.4px;}
-	.sub .election .list_bottom .pagination button{width:30px;height:30px;}
+	.sub .election .list_bottom .list_bottom_right button{height:30px;font-size:14px;letter-spacing:-1.4px;}
+	.sub .election .list_bottom .pagination button{display:inline-flex;width:25px;height:30px;align-items:center;justify-content:center;}
 }
 
 @media only screen and (max-width:1380px){
@@ -2214,6 +2214,9 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 
 	/* 카카오톡 */
 	.kakaotalkset_cont .kakao_wrap .template_category{width: 259px;}
+	
+	/* 선거문자 */
+	.sub .election .list_bottom .list_bottom_right button{width:90px;height:30px;font-size:14px;letter-spacing:-1.4px;}
 }
 
 @media only screen and (max-width:1300px){

src/main/webapp/publish/css/popupLayer.css

@@ -290,7 +290,7 @@
 .error_hover_cont {top: 45px; right: -1px; width: 320px;line-height:1.4;}
 .test_hover_cont {top: 54px; right: -1px; width: 220px;}
 .addr_hover_cont {top:inherit;bottom:40px;}
-
+.sub .election .list_bottom_right .send_hover_cont{width:270px;}
 
 
 /* 통신사 고객센터 정보 */