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

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

@@ -54,7 +54,7 @@
 	          <div >
 	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-danger btn-sm ADB">품목삭제</button>
 	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
-	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_SCAN" class="btn-green btn-sm ADB">스캔</button>
+	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_SCAN" class="btn-primary btn-sm ADB">스캔</button>
 	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_WISH" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_WISH_LIST_AREA">위시리스트</button>
 	          </div>
 	        </div>

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

@@ -364,7 +364,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .float_left input::placeholder {color:#bbb; font-size:10pt;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
-.content .line .float_left div {font-size: 12pt; margin-top: 4px; margin-right:8px; text-align:right; font-weight:100;}
+.content .line .float_left div {font-size: 12pt; margin-top: 2px; margin-right:8px; text-align:right; font-weight:100; color:#b88278;}
 .content .line .float_left .input_text {background: #fff; width: 100%; height: 26px; border: 1px solid #ccc; margin-top: 3px; border-radius: 4px;}
 .content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
 .content .line .float_right_btn {float: left; margin-top: 3px; margin-left: 5px;}