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

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

@@ -179,8 +179,9 @@
 				                 <div class="amt fnUnitAmt">12,000,000</div>
 			                 </div>
                         </div>
-                        <div class="scroll_right">
-                            <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
+                       <div class="scroll_right">
+                        	<input id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" type="checkbox">
+                            <!-- <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button> -->
                         </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>

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

@@ -100,6 +100,7 @@ section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {margin:0; padding:
 section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14px; color:gray;}
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14px; color:#b88278;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
+section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{margin:18px 11px 0 11px;}
 section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:16px 10px;}
 section .popup2 .pop .popup_scroll li .scroll_right button:hover {background:#708cd1;}
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:16px; height:38px;}
@@ -181,6 +182,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN {
     transform: translateX(-50%);
     max-width: 500px;
+    height:100%;
     left: 50%;
     position: fixed;}
 #ITP_LOGIN .login_popup {position: relative; width: 350px; text-align: center;}
@@ -419,7 +421,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
 
 /* scroll_area 조정 */
-.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; bottom: 30px; overflow: auto; background: #fff;}
+.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; margin-bottom:47px; overflow: auto; background: #fff;}
 .scroll_area ul {display:grid;}
 
 
@@ -430,8 +432,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area ul.mb_0 {margin-bottom:0 !important;}
 .scroll_area .itp_non_data {margin:35% auto;}
-.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
 
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
+.scroll_area li.check {background:#E6EFF4;}
 .scroll_area li.list-row {display: inline-flex; height:76px;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
@@ -511,7 +514,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .col_5{min-width:50px;}
 
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
-.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff;}
 .scroll_area li .right .fnnum {margin:10px 30px;}
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
 .scroll_area li .right button:hover {background:#FCD5C1;}
@@ -570,7 +573,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 @media screen and (max-height: 720px) {
 	#ITP_LOGIN {position:fixed; top:80px; max-width: 500px; margin: 0 auto;}
 	.bg_gray {position:relative; top:-90px;}
-	.scroll_area {height: 400px;}
+	.scroll_area {height: 58vh;}
 	section .popup2 .pop .popup_scroll {height: 65%;}
 	}
 @media screen and (max-height: 550px) {