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

src/main/webapp/app/pomng/POMNG08010.html

@@ -28,14 +28,6 @@
 										<div class="col-xs-a itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_POMNG08010_VIEW" class="btn btn-primary btn-sm ADB" style="display: inline-block;">&nbsp;&nbsp;상세&nbsp;&nbsp;</button>
 										</div>
-										<div style="float:right;">
-											<div class="col-xs-a itp_ip itp_noMar" style="margin-right:5px;">
-												<button type="button" id="ITP_BTN_POMNG08010_ITEM_DELETE" class="btn btn-danger btn-sm ADB" style="display: inline-block;">품목삭제</button>
-											</div>
-											<div class="col-xs-a itp_ip itp_noMar">
-												<button type="button" id="ITP_BTN_POMNG08010_ITEM_ADD" class="btn btn-primary btn-sm ADB" style="display: inline-block;">품목추가</button>
-											</div>
-										</div>
 									</div>
 								</form>
 							</div>
@@ -44,6 +36,8 @@
 					<div class="itp_table fix">
 						<div id="ITP_POMNG08010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_POMNG08010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_POMNG08010_ITEM_DELETE" class="btn btn-danger btn-sm ADB" style="float:right; margin-right:10px;">품목삭제</button>
+							<button type="button" id="ITP_BTN_POMNG08010_ITEM_ADD" class="btn btn-primary btn-sm ADB" style="float:right; margin-right:5px;">품목추가</button>
 							<table id="ITP_POMNG08010_jqGrid"></table>
 							<div id="ITP_POMNG08010_jqGridPager"></div>
 							<div id="ITP_POMNG08010_jqGridEmpty" class="itp_no_data"></div>

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

@@ -211,7 +211,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN .login_popup .num_area {position: relative; width: 100%;  margin-bottom: 30px;}
 #ITP_LOGIN .login_popup .num_area .input_area {margin-bottom: 8px;}
 #ITP_LOGIN .login_popup .num_area .input_area input {width:50%; font-size: 0.8rem; }
-#ITP_LOGIN .login_popup .num_area .input_area button {margin-left: 0.1%; width: 19.5%; height: 45px; background-color: #f7b014; color: #eee; font-size: 16px; padding: 0; border:3px solid #fbd896; border-radius: 10px;}
+#ITP_LOGIN .login_popup .num_area .input_area button {margin-left: 0.1%; width: 19.5%; height: 45px; background-color: #f7b014; color: #eee; font-size: 16px; padding: 0; border:none; border-radius: 10px;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no {width:50px; right:123px; top:2px;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no button {width:45px; border:none; background:transparent;}
 #ITP_LOGIN .login_popup .itp_del_btn {position:absolute; top:13px; right:66px; background:transparent;}
@@ -232,7 +232,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN .login_btn {position: relative; top: -20px; left: 0;}
 #ITP_LOGIN .login_btn button {
   font-weight: nomal;
-  border:3px solid #fbd896; border-radius: 10px;
+  border:none; border-radius: 10px;
   color: #eee;
   background-color: #f7b014;
   width: 70%;