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

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

@@ -119,8 +119,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
-				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="col_12 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -104,7 +104,7 @@
 								<label>발주수량</label>
 								<span>:</span>
 								<div class="fnColReqQty"></div>
-								<label class="sub_info">입고수량</label>
+								<label class="sub_info">수거수량</label>
 								<span>:</span>
 								<div class="fnRodrQty"></div>
 							</div>

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

@@ -384,7 +384,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:12px;}
-.content .line .search button {width: 40%; height: 27px; font-size: 12px; font-weight:100; padding: 0;}
+.content .line .search button {width: 40%; height: 30px; font-size: 12pt; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; height:30px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}