Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -8,10 +8,8 @@
 			<div class="modal-body">
 
 				<div class="itp_form itp_type1 fix" >
-					<div class="col-xs-12 itp_ip" style="top:-30px;">
+					<div class="text_area col-xs-12 itp_ip">
 						수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
-						<br>
-						<br>
 					</div>
 				</div>
 
@@ -92,18 +90,12 @@
 										<label class="shot">이메일</label>
 									</div>
 									<div class="info_box">
-										<div class="itp_pd_none email">
 											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">
 											<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="itp_input" name="emailId" />
-										</div>
-										<div style="padding:0 5px;">@</div>
-										<div class="itp_pd_none email">
+										<div style="width: 60px; padding:0 5px;">@</div>
 											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM" name="emailNm" class="itp_input" type="text" data-check-required="empty">
-										</div>
-										<div class="col-xs-5">
 											<select name="emailCd" id="ITP_FORM_PO_PAYMENT_POPUP_EMAIL_CD" data-select-code="EMAIL_CD" class="itp_input">
 											</select>
-										</div>
 									</div>
 								</div>								
 							</form>

src/main/webapp/mobile/css/style.css

@@ -614,7 +614,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 /* 알림 팝업 추가 */
 .modal {position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; display: none; overflow: hidden; outline: 0;}
 .itp_modal {z-index: 10000;}
-.modal-dialog {position: relative; width: auto; margin: 10px;}
+.modal-dialog {position: relative; width: auto; margin: 10px; top: 50%; transform: translateY(-50%);}
 .modal-dialog .line {display:flex;border:1px solid #aaa; border-bottom:none; height:40px;}
 .modal-dialog .border{border-bottom:1px solid #aaa;}
 .modal-dialog .border .label_box {height:38px !important;}
@@ -622,16 +622,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .modal-dialog .line .label_box label {font-size:14px; font-weight:100;}
 .modal-dialog .line .info_box {width: calc(100% - 100px); padding:10px; display:flex;}
 .modal-dialog .line .info_box .email {width:30%;}
-.modal-dialog .line .info_box input{position:relative; top:-4px; width:100%; margin:0;}
+.modal-dialog .line .info_box input{position:relative; top:-4px; width:100%; height:27px; margin:0;}
 .modal-dialog .line .info_box select{position:relative; top:-4px; width:100%; height:27px;}
-.modal-dialog .line .info_box div{font-size:14px; font-weight:100;}
+.modal-dialog .line .info_box div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:left; font-size:14px; font-weight:100;}
 .modal-content {position: relative; background-color: #fff; background-clip: padding-box; border: 1px solid #999; border: 1px solid rgba(0,0,0,.2); border-radius: 6px; outline: 0; box-shadow: 0 3px 9px rgb(0 0 0 / 50%);}
 .modal-header {min-height: 16.43px; padding: 15px; border-bottom: 1px solid #e5e5e5; color:#fff; padding: 12px 15px 12px 15px; background: #337ab7; cursor: move;}
 .modal-header .close { margin-top: -2px; color: #fff; opacity: 1;}
 button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background: 0 0; border: 0;}
 .close {float: right; font-size: 21px; font-weight: 700; line-height: 1; text-shadow: 0 1px 0 #fff;}
-.modal-body {position: relative; padding: 15px;}
-.modal-footer {padding: 15px; text-align: right; border-top: 1px solid #e5e5e5;}
+.modal-body {position: relative; padding: 15px; }
+.modal-body .text_area{padding-bottom:20px; }
+.modal-footer {padding: 15px; text-align: right; border-top: none;}
 .modal-footer .pop_btn_bar {float:right; margin-top:12px;}
 .modal-footer .btn {border-radius:6px; padding: 6px 12px;}