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

src/main/webapp/login.html

@@ -15,6 +15,7 @@
 	<link rel="shortcut icon" type="image/png" href="./images/favicon.ico"/>
 	<link rel="stylesheet" href="./bootstrap/dist/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="./css/style.css" />
+	<link rel='stylesheet' href='//cdn.jsdelivr.net/npm/font-kopub@1.0/kopubdotum.min.css'>
 
 	<script>
 		const VIEW_PAGE = 'LOGIN'; //config.js 에서 로그인 페이지 인지 아닌지 확인하기 위한 변수

src/main/webapp/mobile/app/main.html

@@ -10,6 +10,7 @@
 	<link rel="stylesheet" href="../../bootstrap/dist/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="../../bootstrap-datepicker/css/bootstrap-datepicker3.css" />
 	<link rel="stylesheet" href="../css/style.css?2011221">
+	<link rel='stylesheet' href='//cdn.jsdelivr.net/npm/font-kopub@1.0/kopubdotum.min.css'>
 
 	<script>
 		const ITP_SYSTEM_ADMIN_YN = 'Y';

src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -13,7 +13,7 @@
 				<div class="line mt5">
 					<label>반품요청일</label>
 					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
-				</div>
+				</div> 
 				<div class="line">
 					<label>반품요청금액</label>
 					<div class="float_left">
@@ -68,7 +68,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-orange REQ">반품요청</button>
+				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-m-orange REQ">반품요청</button>
 				<button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
 				<button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
 			</div>

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

@@ -1,12 +1,16 @@
-@font-face {
+/* @font-face {
     font-family: 'GmarketSansMedium';
     src: url("../main/webapp/mobile/fonts/KoPubWorld Dotum Medium.ttf") format('woff');
+} */
+/* @font-face {
+    font-family: 'GmarketSansMedium';
+    src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
     font-weight: normal;
     font-style: normal;
-}
-* {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
+} */
+* {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'KoPub Dotum', 'serif'; list-style: none;}
 section {}
-body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'GmarketSansMedium';
+body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'KoPub Dotum';
 	overflow:scroll-y; 
 	-webkit-overflow-scrolling:touch;}
 body .login {position:fixed;}
@@ -145,8 +149,8 @@ button {background-color: #fff; padding: 10px;}
 button.btn-primary  {color: #fff; background-color: #8f9fc6; border: 1px solid #cacfe3;}
 button.btn-primary:active{background-color: #708cd1;}
 button.btn-yellow   {color: #fff; background-color: #f9c03c; border: 1px solid #cacfe3;}
-button.btn-orange	{color: #fff; background-color: #f0831e; border: 1px solid #cacfe3;}
-button.btn-orange:active {border:3px solid #708cd1; background-color: #fff; color:#B7B8B8;}
+button.btn-m-orange	{color: #fff; background-color: #f0831e; border: 1px solid #cacfe3;}
+button.btn-m-orange:hover {border:3px solid #f0831e !important; background-color: #fff; color:#B7B8B8;}
 button.btn-gray     {color: #fff; background-color: #a89d9c; border: 1px solid #cacfe3;}
 button.btn-danger   {color: #fff; background-color: #c8989d; border: 1px solid #cacfe3;}
 button.btn-green	{color: #fff; background-color: #5cb85c; border: 1px solid #cacfe3;}