Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -685,11 +685,11 @@ header #htopSub{border-bottom: 0 solid #e5e5e5;box-sizing: border-box;}
 header #htopSubs{border-bottom: 0 solid #000000;box-sizing: border-box;}
 header #htopSub.my_main {background-color: #f5f5f5; border-bottom: 0.1rem solid rgba(0, 0, 0, 0.0)!important;}
 header .htop h1 {display: inline-block;position: relative;width:auto;max-width: calc(100% - 14.5rem);height: 5.5rem;line-height: 5.5rem;vertical-align: middle;margin: 0 0 0 2.0rem;font-size: 1.8rem;color: #222;}
-header .htop h1#htopTitle {display: inline-block;position: relative;max-width: 18rem;width: auto;height: 100%;line-height: 4.5rem;vertical-align: middle;padding: 0 1.5rem 0 0rem;font-size: 1.8rem;color: #222;}
+header .htop h1#htopTitle {display: inline-block;position: relative;max-width: 18rem;width: auto;height: 100%;line-height: 5.8rem;vertical-align: middle;padding: 0 1.5rem 0 0rem;font-size: 1.8rem;color: #222;}
 header .htop h1 a {height: 100%;width: 100%;display: block;}
 header .htop h1 img {margin: 0;width: 11.5rem;height: auto;line-height: 1.6rem;vertical-align: middle;}
 header .htop h1 a p{color: #222;line-height: 5.5rem;font-size: 2.0rem;height: 5.5rem;display: inline;vertical-align: middle;display: -webkit-box;word-break: break-all;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;}
-header .htop .btn_back {margin: 1.0rem 0 0 1.5rem;width: 3.5rem;height: 3.5rem;}
+header .htop .btn_back {margin: 1.0rem 0 0 1.5rem;width: 3.5rem;height: 3.5rem; float: left;}
 header .htop .btn_back span {display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;}
 header .htop .btn_back span i {display: block;position: absolute;background: #222;-webkit-transition: all 0.3s ease-out;transition: all 0.3s ease-out;}
 header .htop .btn_back span i.gl1 {left: -0.2rem;top: 0.7rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
@@ -722,7 +722,7 @@ header .btn_gnb span i {display: block;position: absolute;left: 0;width:100%;hei
 /* header .btn_gnb.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);} */
 /* header .btn_gnb.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);} */
 
-header .subs .btn_gnbs {position: absolute;top: 0;right: -2.0rem;width: 3.5rem;height: 4.5rem;z-index: 10;}
+header .subs .btn_gnbs {position: absolute;top: 0.8rem;right: -2.0rem;width: 3.5rem;height: 4rem;z-index: 10;}
 header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 100%;height: 100%;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
 /* header .subs .btn_gnbs span {display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;} */
 /* header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 2.4rem;height: 0.2rem;background: #222;-webkit-transition: all 0.15s ease-out;transition: all 0.15s ease-out;} */

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

@@ -416,7 +416,8 @@
 .itemLike.likeit::before {opacity: 1;}
 .item_prod .itemLink {position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .item_prod .itemPic {position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 150%;font-size: 0;overflow: hidden; background: #fff;}
-.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
+.item_prod .itemPic::before {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
+/* .item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;} */
 .item_prod .itemPic .pd_img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
 .item_prod .itemPic .pd_mov {position: absolute;width: 100%;height: 100%;top: 50%;left: 0;transform: translateY(-50%);z-index: 2;}
 .item_prod .itemBrand {display: inline-block; margin: 0 0.5rem 0.3rem; font-size: 1rem;font-weight: 300;color: rgb(137, 137, 137); text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:10rem;overflow:hidden;}

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

@@ -403,8 +403,8 @@
 .main_pick .inner_body .pick-cont .swiper-container a:after {content:''; position: absolute; left: 0; bottom: 0; width: 100%; height: 60%; background: linear-gradient(0deg, rgba(0,0,0,0.5) 0%, transparent 100%);}
 .main_pick .inner_body .pick-cont a {position: relative;display: block;}
 .main_pick .inner_body .pick-cont a .txtWrap{position: absolute;bottom: 4rem;margin-left: 1.9rem; z-index: 1;}
-.main_pick .inner_body .pick-cont a .txtWrap p{font-size: 2.3rem;font-weight: 500;color: #fff;font-weight: 300;}
-.main_pick .inner_body .pick-cont a .txtWrap span{font-size: 1.2rem;font-weight: 100;color: #fff;margin-top: 0.5rem;display: block;}
+.main_pick .inner_body .pick-cont a .txtWrap p{font-size: 2.3rem;font-weight: 500;color: #fff;font-weight: 300;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+.main_pick .inner_body .pick-cont a .txtWrap span{font-size: 1.2rem;font-weight: 100;color: #fff;margin-top: 0.5rem;display: block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
 .main_pick .inner_body .pick-cont a img{width: 100%;height: auto;}
 .main_pick .inner_body .btn_group_flex > div > button > span {display: inline-block;background: url(/images/mo/ico_btn_brand.png) no-repeat;background-size: 1.1rem 1.1rem;width: 1.1rem;height: 1.1rem;margin-left: 0.8rem;}
 
@@ -526,15 +526,15 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .hookGrp .hook_cont h4{font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
 .hookGrp .hook_cont p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
 .hookGrp .hook_cont p em{font-size:1.2rem;font-weight:400;color:#222222;line-height:2.2rem;letter-spacing:-0.025em;}
-.hookGrp .hook_cont ol li{font-size:1.2rem;padding-left: 0.3rem;}
+.hookGrp .hook_cont ol li{font-size:1.2rem;padding-left: 0.3rem;} 
 
 
+.ps#prvc_sel {margin-bottom: 5.0rem;}
 .ps#prvc_sel h4 {font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
 .ps#prvc_sel p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
 .ps#prvc_sel p em{font-size:1.2rem;font-weight:400;color:#222222;line-height:2.2rem;letter-spacing:-0.025em;}
-.ps#prvc_sel ol li {font-size:1.2rem;padding-left: 0.3rem;}
-.ps#prvc_sel ol li {line-height: 2.6rem;}
-.ps#prvc_sel {margin-bottom: 5.0rem;}
+.ps#prvc_sel ol li {font-size:1.2rem;padding-left: 0.3rem; line-height: 2.6rem;} 
+.ps#prvc_sel ol li a.on{font-weight: 400;}
 
 .pager {height: 100%;margin-top: 2.0rem;margin-bottom: 2.0rem;}
 .pager .pageNav {display: table;margin-left: auto;margin-right: auto;}
@@ -1893,7 +1893,7 @@ background-size:100%;}
 .od .fold_cont .area_overseas .form_field {margin-top: 2.4rem;}
 .od .fold_cont .area_overseas .form_field input[type="radio"] + label {margin-bottom: 1.5rem;}
 .od .fold_cont .area_overseas .form_field > div {}
-.od .fold_cont .area_overseas .info_txt {background: #fff6f2; margin-top: 0;}
+/* .od .fold_cont .area_overseas .info_txt {background: #fff6f2; margin-top: 0;} */
 .od .fold_cont .area_overseas .info_box {font-size:1.6rem;}
 .od .fold_cont .area_overseas .info_box .t_err {margin-top:0.5rem; font-size:1.1rem;}
 .od .fold_cont .area_overseas .info_box.overs1 {margin-right:0}
@@ -2595,7 +2595,7 @@ main.container .od_gift .inner:last-child {padding-bottom: 0;}
 .od_gift .tbl_wrap .tbl.tbl_request input[type="text"]::placeholder {}
 .od_gift .tbl_wrap .tbl.tbl_request .desc_txt {margin-top: 1rem;}
 
-.od_gift .info_txt {margin-top: 2.4rem; background: #f5f5f5;}
+/* .od_gift .info_txt {margin-top: 2.4rem; background: #f5f5f5;} */
 
 .part_goods .goods_section > .od_calc {margin: 1rem 0 0 0; padding:1.3rem 0 0 0; position: relative; line-height: 1; border-top: 0.1rem solid #ddd;}
 .part_goods .goods_section > .od_calc .price {top: auto; bottom: 0;}

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

@@ -807,7 +807,8 @@ content: "〉";font-size: 12px;padding-left: 8px;
 
 .itemLink {z-index:20;position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .itemPic {position: relative;width: 100%;margin-bottom:20px;padding-top: 150%;font-size: 0px;overflow: hidden;}
-.itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;}
+.itemPic::before {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 98;}
+/* .itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;} */
 .itemPic .pd_img,
 .itemPic .pd_mov {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
 .itemPic .pd_mov {z-index: 2;height: 100%;left: -83.45%;width: 267%;}

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

@@ -165,7 +165,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_header.br_header .depth_menu .head_category .menu ul.maintabs {border-left:0}
 .common_header.br_header .depth_menu .head_banner {background: #ffffff; width:32%;}
 .common_header.br_header .depth_menu .head_banner li { width: 33.333%;}
-.common_header.br_header .depth_menu .head_banner li img{top: 50%;left: 0px;}
+.common_header.br_header .depth_menu .head_banner li img{top: 50%;left: 0px;transform: translateY(-50%);}
 .common_header.br_header .depth_menu .head_banner li:first-child {margin-right:0;}
 .common_header.br_header .depth_menu .item_prod {width: 100%;}
 .common_header.br_header > .area {height:90px;background: inherit;}
@@ -4907,7 +4907,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemLink {display: table-cell; position: static; vertical-align: middle;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPic {position: absolute; top: 0; left: 0; margin-bottom: 0; width: 260px; height:390px; padding:0; background: #f9f9f9;}
 	/* .modal.lookbook_item_pop .itemsGrp .item_state.soldout .itemPic:before {content:'SOLD OUT'; position: absolute; top: 50%; left: 50%; font-size: 20px; color:#fff; background: rgba(0,0,0,.5); width: 100%; height: 100%; transform:translate(-50%, -50%); line-height: 420px; text-align: center;} */
-	.modal.lookbook_item_pop .itemsGrp .item_prod .itemBrand {margin:0px 0px 15px; font-size: 14px; font-weight: 300;}
+	.modal.lookbook_item_pop .itemsGrp .item_prod .itemBrand {margin:0px 0px 15px; font-size: 14px; font-weight: 300; line-height: 14px;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemName {margin:0px 0px 25px; font-size: 18px; font-weight: 300; line-height: 28px; height:56px;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPrice {font-size: 26px; line-height: 1; font-weight: 500; margin:0;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPrice_original {display: inline-block; margin-left:0; margin-bottom:10px; font-size: 20px; font-weight: 200;}

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

@@ -505,7 +505,7 @@
 .fy_nav .btn_shape div span {color:#888888; font-size:18px; font-weight:300; line-height:1;display: inline;}
 .fy_nav .btn_shape div::after {content: ''; display: inline-block; clear: both; }
 .fy_nav .btn_shape div .number { float: left; padding-right:25px; color:#222222; font-size:20px; font-weight:500;}
-.fy_nav .btn_shape div .number + span {color:#888888; font-size:18px; font-weight:300; line-height:1.2;width: 162px;display: inline-block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
+.fy_nav .btn_shape div .number + span {color:#888888; font-size:18px; font-weight:300; line-height:1.2;width: 151px;display: inline-block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
 .fy_nav .btn_shape + a {display:none;}
 .fy_nav .btn_shape.active {position:relative; background:#222222; border-color:rgb(245 245 245);}
 .fy_nav .btn_shape.active span {position:relative; color:#ffffff;}