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

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

@@ -169,25 +169,17 @@
 				</div>
 				<div id="ITP_MAIN_HEADER_STORE" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
-						<label>구매요청</label>
-						<span>:</span>
-						<div class="fnPr20Count">2 건</div>
-					</div>
-					<div class="itp_oper_info">
+						<label class="col_6">구매요청</label>
+						<div class="col_6 fnPr20Count">2 건</div>
 						<label>발주진행</label>
-						<span>:</span>
 						<div class="fnPo30Count">12,000,000원</div>
 					</div>
 					<div class="itp_oper_info">
+						<label class="col_6">구매가능금액</label>
+						<div class="col_6 fnPoPsblAmt">1,000원</div>
 						<label>발주완료</label>
-						<span>:</span>
 						<div class="fnPoEndCount">1,000원</div>
 					</div>
-					<div class="itp_oper_info">
-						<label>구매가능금액</label>
-						<span>:</span>
-						<div class="fnPoPsblAmt">1,000원</div>
-					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">

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

@@ -672,8 +672,8 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 
 /* 메인화면 공지사항 추가 */
 #ITP_MAIN_CONTAINER.itp_main_box{position:relative; height:calc(100vh - 49px); overflow:auto;}
-#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:46px; padding:10px; border-bottom:1px solid #aaa; background:#dce6f2;}
-#ITP_MAIN_CONTAINER .itp_note_header h1 {font-size:16pt; text-align:left; margin:0;}
+#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:37spx; padding:9px; border-bottom:1px solid #aaa; background:#dce6f2;}
+#ITP_MAIN_CONTAINER .itp_note_header h1 {font-size:12pt; text-align:left; margin:0;}
 #ITP_MAIN_CONTAINER .itp_note_bar {height: auto; max-height:180px;}
 #ITP_MAIN_CONTAINER .itp_note_bar h1 {position:relative; font-weight:700; font-size:14pt; margin:0; height:60px; padding-top:20px; border-bottom:1px solid #aaa;}
 #ITP_MAIN_CONTAINER .itp_note_bar li {border-bottom:1px solid #aaa; padding:5px; height:60px;}
@@ -685,9 +685,11 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info .under {text-decoration: underline;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area {border-bottom:1px solid #aaa; padding:5px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info {display:flex; height:24px;}
-#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label{font-size:12pt; text-align:left; width:90px;}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label{font-size:12pt; text-align:left; width:65px; padding-left:10px;}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label.col_6{width:95px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info span{width:14px;}
-#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(50% - 114px);}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(50% - 70px);}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div.col_6{width:calc(50% - 95px);}
 #ITP_MAIN_CONTAINER .itp_graph_area {width:98%; height:300px; border:1px solid #aaa; margin:5px 1%;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:160px; margin:5px;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left; float:left;}