Merge branch 'develop' into card007

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -492,7 +492,7 @@ if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 				}
 				html += ' "';
 				html += 'onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
-				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')"  class="itemLink">\n';
+				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\',\'\',\'' + item.planDtlSq+ '\')"  class="itemLink">\n';
 				html += '							<div class="itemPic">\n';
 				html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'?RS=550">\n';
 				html += '							</div>\n';

src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -542,12 +542,12 @@
 		$.getJSON(url, function (result, status){
 			if(result.length>0){
 				$.each(result, function (idx, item) {
-					html += '<a href="javascript:void(0);" onclick="cfnSearchLayer();"><p class="promotion_search">'+item.keyword+'</p></a>\n';
+					html += '<p class="promotion_search" onclick="cfnSearchLayer();">'+item.keyword+'</p>\n';
 					// html += '<button type="button" class="btn_sch_promotion" id="btnGnbSearch" onclick="cfnSearchLayer();"><i class="ico ico_search"><em>프로모션 검색 바로가기</em></i></button>';
 					html += '<button type="button" class="btn_sch_promotion" id="btnGnbSearch" onclick="fnGotoLink(\''+item.linkUrl+'\');"><i class="ico ico_search"><em>프로모션 검색 바로가기</em></i></button>';
 				});
 			}else{
-				html += '<a href="javascript:void(0);" onclick="cfnSearchLayer();"><p class="promotion_search"></p></a>\n';
+				html += '<p class="promotion_search" onclick="cfnSearchLayer();"></p>\n';
 				html += '<button type="button" class="btn_sch_promotion" id="btnGnbSearch" onclick="cfnSearchLayer();"><i class="ico ico_search"><em>프로모션 검색 바로가기</em></i></button>\n';
 			}
 			$("#searchArea").append(html);

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -45,7 +45,9 @@
 													<a th:if="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_self" title="새 창으로 열기" class="btn"><span>자세히 보기</span></a>
 													<a th:unless="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_blank" title="새 창으로 열기" class="btn"><span>자세히 보기</span></a>
 												</div>
-												<img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
+												<div class="imgWrap">
+													<img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
+												</div>
 											</th:block>
 										</div>
 									</th:block>

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -316,7 +316,7 @@ if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 				html += ' "';
 				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 				
-				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\',\'\',\'' + item.planDtlSq+ '\')" class="itemLink">\n';
 				html += '                             <div class="itemPic">\n';
 				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'?RS=550">\n';
 				html += '                             </div>\n';

src/main/webapp/ux/mo/css/layout_m.css

@@ -465,7 +465,8 @@
 .pd_detail > .inner.wide{padding-left:0!important; padding-right:0!important; padding-bottom:0;}
 .pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
 .pd_detail .movbox #prodMovBtn{background: rgb(246 55 55 / 0%);  position: absolute;top: 0;left: 0;width: 100%;height: 100%;border: none;color: transparent;font-size: 0.1rem;z-index: 2;}
-.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
+/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;} */
+.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;left:-100%}
 .pd_detail .thumb_box{position: relative;}
 .pd_detail .thumb_box .thumb_list{position:relative;}
 .pd_detail .thumb_box .thumb_list .thumb{position:relative; width:100%; padding-bottom: 150%;; background-color:#f5f5f5; overflow: hidden;}

src/main/webapp/ux/mo/js/common_m.js

@@ -722,6 +722,14 @@ $( document ).ready( function() {
         $('.htop .store').css({"display": "none"});
     };
 
+    
+    /* 210805_ 추가 : 고객센터_Header Style */
+    if($('main').hasClass("cs")){
+        $('.htop .home').css({"display": "inline-block"});
+    };
+
+
+
     /* 검색_Header Style */
     let schPage = document.getElementsByClassName('sch');
     if($(schPage).children("section").hasClass("sch_result")){

src/main/webapp/ux/pc/css/layout.css

@@ -120,7 +120,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_header .search {float:right; margin-top:-14px;}
 .common_header .search > .area{float:left;position:relative;width:330px;border-bottom:2px solid #ffffff; margin-right: 20px; -webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out;}
 .common_header .search .ico_search:before {width:23px; height:23px;}
-.common_header .search .promotion_search {float:left; width:calc(100% - 30px); padding:0px; border:0;outline:none;font-size:18px;color: #bcbcbc;font-weight:200; line-height:34px; cursor:pointer; min-height:35px;}
+.common_header .search .promotion_search {float:left; width:calc(100% - 30px); height:34px; padding:0px; border:0;outline:none;font-size:18px;color: #bcbcbc;font-weight:200; line-height:34px; cursor:pointer;}
 .common_header .search button{float:right; margin:4px 0 0 0;}
 .common_header .search .btn_open_search {display:none; float:left; margin-right:20px; margin-top:5px;}
 .common_header .search .btn_cart {margin-top:4px;}
@@ -213,7 +213,11 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_search .default_box .realtime_blk .modify_timer {position:absolute; right:0; top:50px;}
 .common_search .default_box .realtime_blk .modify_timer button {color:#888; font-weight: 300; padding-right: 20px;}
 .common_search .default_box .realtime_blk .modify_timer button:after {content:''; position: absolute; top: 50%; right: 0; width: 14px; height: 14px; background: url('/images/pc/ico_filter_reset02.png') no-repeat center; margin-top: -6px;}
-.common_search .realtime_wrap {margin:0 -10px; padding-bottom:20px; white-space: nowrap; overflow-x:auto;}
+.common_search .realtime_wrap {margin:0 -10px;}
+.common_search .realtime_wrap .swiper-controls {margin-top: 20px;}
+.common_search .realtime_wrap .swiper-scrollbar {background:#ddd; height:2px; opacity: 1 !important;}
+.common_search .realtime_wrap .swiper-scrollbar-drag {border-radius:0; background:#222;}
+.common_search .realtime_wrap .item_prod {width: 100%;}
 .common_search .realtime_wrap .item_prod .itemName {color:#000; margin:0 0 15px; font-weight: 300;}
 .common_search .realtime_wrap .item_prod .viewCount {display:table; width: fit-content;height: 30px;color: #fd4802;line-height: 1;font-size: 14px;font-weight: 400;text-align: center;vertical-align: middle;letter-spacing: -.025rem;padding: 6px 12px;border: 2px solid #fd4802;border-radius: 50px;box-sizing: border-box;}
 .common_search .realtime_wrap .item_prod .item_state {padding-bottom: 0;}
@@ -2507,7 +2511,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .thumb img,
 	.pd_detail .thumb video {position:absolute; left:0; top:50%; width:100%; transform:translateY(-50%) ; z-index:2;}
 	.pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
-	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none;left: -83.45%;width: 185%;}
+	/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none; left: -83.45%;width: 185%;} */
+	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;pointer-events:none; left: -100%;}
 	.pd_detail .movbox iframe[src*="youtu"] {left:0; width: 100%;}
 	.pd_detail .btn_popup {display:inline-block; padding:0px; box-sizing:border-box;}
 	.pd_detail .btn_popup span {color:#888; font-size:12px; font-weight:200; border-bottom:1px solid #888;}

src/main/webapp/ux/pc/css/main.css

@@ -471,9 +471,10 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 .brand_main .brand_visual .swiper-button-disabled {display: none;}
 .brand_main .post-visual .swiper-container {margin-left:0;}
 .brand_main .post-visual .swiper-wrapper {padding-bottom:0;}
-.brand_main .post-visual .swiper-slide {position:relative; max-width:1520px; padding-left:23.6%; mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; -webkit-mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; /*transition:all 200ms ease;*/}
+.brand_main .post-visual .swiper-slide {position:relative; width:100%; max-width:1520px; padding-left: 0; mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; -webkit-mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; /*transition:all 200ms ease;*/}
 .brand_main .post-visual .swiper-slide img {width:1080px; margin:0;}
-.brand_main .post-visual .swiper-slide .txtWrap {width: 30%; opacity:0; position:absolute; padding-left:0px; top:110px; bottom:auto; left:0px; right:auto; z-index:1;}
+.brand_main .post-visual .swiper-slide .txtWrap {width: 450px; opacity:0; position:absolute; padding-left:0px; top:110px; bottom:auto; left:0px; right:auto; z-index:1;}
+.brand_main .post-visual .swiper-slide .imgWrap {padding-left:450px;}
 .brand_main .post-visual .txtWrap dt {font-size:0; padding-bottom:0;}
 .brand_main .post-visual .swiper-slide-active {opacity:1 !important;}
 .brand_main .post-visual .swiper-slide-active .txtWrap {animation-name: fade-in;animation-duration: 1.5s;animation-delay: 1s;animation-fill-mode: both;}
@@ -492,7 +493,7 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 }
 
 .brand_main .post-visual .swiper-slide-prev {opacity:0;}
-.brand_main .post-visual .swiper-slide-next {opacity:1 !important; padding-left:0px; padding-right:440px;}
+.brand_main .post-visual .swiper-slide-next .imgWrap {padding-left:0;}
 .brand_main .post-visual .swiper-controls {position:absolute; width:auto; bottom:100px; left:50%; padding-right:15px; z-index:10; margin-left:-780px;}
 .brand_main .post-visual .swiper-controls .swiper-pagination {margin-top:0;}
 
@@ -635,7 +636,8 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 
 /* brand_main :ie */
 @media screen and (-ms-high-contrast:active), (-ms-high-contrast:none) {
-	.brand_main .post-visual .swiper-slide {z-index:9; margin:0; box-shadow:none; padding-bottom:0; width: 1520px;}
+	.brand_main .post-visual .swiper-slide {z-index:9; margin:0; box-shadow:none; padding-bottom:0; padding-left: 30px; width: 1520px;}
+	.brand_main .post-visual .swiper-slide {left:-250px;}/*width: 1025px; width: 1520px; overflow: visible; */
 	.brand_main .post-visual .swiper-slide:before {display:none;}
 	.brand_main .post-visual .swiper-slide-active {z-index:8;}
 	.brand_main .post-visual .swiper-slide-active:before {display:block;}