Browse Source

수정된 퍼블 반영

gagamel 5 years ago
parent
commit
82e8486e9a

+ 8 - 4
src/main/webapp/ux/pc/css/common.css

@@ -204,8 +204,6 @@ section::after, .ui_row::after, .btn_group_block::after{content: '';display: blo
 }
 
 
-
-
 /* textarea */
 textarea {background-color:transparent; border:1px solid #d7d7d7; width:99%; overflow-y:auto}
 .textarea_full {width:832px; padding:10px}
@@ -635,6 +633,10 @@ content: "〉";font-size: 12px;padding-left: 8px;
   margin-left: 0;
 }
 
+/* page loading */
+#load {width: 100%;height: 100%;top: 0;left: 0;position: fixed;display: block;text-align: center;opacity: 0.6;background: #ffffff;background-image: url('/images/pc/movloading.gif');background-repeat: no-repeat;background-position: 50% 50%;background-size: 37px 36px;z-index: 99999;}
+
+
 /* pageNav */
 .pageNav {display: table; margin-left: auto; margin-right: auto;}
 .pageNav:after {display: table;clear: both;content: " ";}
@@ -801,6 +803,7 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemPic .pd_mov {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
 .itemPic .pd_mov {z-index: 2;height: 100%;}
 .itemPic .pd_img {z-index: 1;transition: 0.5s;}
+.itemPic .pd_img::after {content: '';display: block; height: 100%;width: 100%;background: #333;}
 /* .itemPic .pd_img {position: absolute;width: 100%;width: auto; height: auto;max-height: 500px;top: 50%;left: 50%;transform: translate(-50%,-50%);} */
 .itemOpt{z-index:3; pointer-events:none;position: absolute;bottom: -120px; left: 0; right: 0; width: 100%; height:111px;padding: 32px 0; text-align:center; color: #fff; background: rgb(0 0 0 / 0.8); }
 .itemOpt p{font-size: 12px;line-height: 1.2;padding-bottom: 15px;}
@@ -1296,7 +1299,7 @@ input[type="file"] {
 .quick_menu_group .area > div:first-child span:first-child a{margin-left:0}
 .quick_menu_group .area > div:first-child span:first-child a:after{display:none}
 .quick_menu_group .area > div:first-child span a:after{position:absolute;top:13px;left:0;width:1px;height:13px;background:#959596;content:''}
-.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}*/
+.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}
 
 
 
@@ -1309,12 +1312,13 @@ input[type="file"] {
 		margin-top: 26px !important; 
 		line-height: 0.6 !important; 
 	}
+}
 	.pageNav .disabled a {background-position: 0 9px !important; }
 	.pageNav .disabled.prev a {background-position: -23px 9px !important; }
 	.pageNav .next a,.pageNav > li:last-child a {background-position:-64px 9px !important; }
 	.pageNav .next a {background-position: -47px 9px !important; }
 	.filter_content .sort#tap01 ul li.noDepth.on > a::after {top:8px !important;}
-}
+
 
 /* 제거예정 */
 

+ 1 - 10
src/main/webapp/ux/pc/js/common-ui.js

@@ -84,19 +84,10 @@ $(document).ready(function() {
 				var fileReader = new FileReader();
 				fileReader.onload = (function(e) {
 					var file = e.target;
-					if(file.result.indexOf("video/mp4") > -1){
-						$("<span class=\"pics\">" +
-						"<ifram class=\"picsThumbs\" src=\"" + e.target.result + "\" />" +
-						"<br/><span class=\"removes\">Removes image</span>" +
-						"</span>").insertAfter("#fileAdd");
-					}else{
-						$("<span class=\"pics\">" +
+					$("<span class=\"pics\">" +
 						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
 						"<br/><span class=\"removes\">Removes image</span>" +
 						"</span>").insertAfter("#fileAdd");
-					}
-					
-					
 					$(".removes").click(function(){
 						$(this).parent(".pics").remove();
 					});

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/ux/pc/js/ion.rangeSlider.min.js


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/ux/pc/js/jquery-1.11.0.min.js


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/ux/pc/js/jquery-migrate-1.2.1.min.js


File diff suppressed because it is too large
+ 9 - 0
src/main/webapp/ux/pc/js/vg-controller-client.latest.min.js


Some files were not shown because too many files changed in this diff