Bläddra i källkod

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

jsshin 5 år sedan
förälder
incheckning
c3978478a4

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 181 - 178
src/main/webapp/ux/mo/css/layout_m.css


+ 2 - 2
src/main/webapp/ux/mo/css/style24_m.css

@@ -965,7 +965,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .lnb_list li a {display: block; padding: 2rem; background: url(/images/mo/ico_lnb_arrow.png) no-repeat right 2rem center; background-size:0.7rem 1.26rem;}
 
 .my .mem_rank {position: relative; padding:1.6rem 0; padding-left: 6rem;}
-.my .mem_rank .mem_name {dib font-size: 1.8rem; font-weight: 300;}
+.my .mem_rank .mem_name {display: inline-block; font-size: 1.8rem; font-weight: 300;}
 .my .mem_rank .mem_name strong {font-weight: 500;}
 .my .mem_rank .rank_txt {display: inline-block; font-size: 1.8rem; color: #666; font-weight: 500; padding-right: 1.7rem; background: url(/images/mo/ico_btn_detail03.png) no-repeat right top 5px; background-size:0.7rem 1.3rem;}
 .my .mem_rank .rank_txt02 button {display: inline-block; font-size: 14px; padding-right: 13px; margin-right: 20px; background: url(/images/pc/ico_mysm_arrow.png) no-repeat right top 6px;}
@@ -2596,7 +2596,7 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 #daumZipcodePop .modal-content {margin-top:5rem;}
 
 /* popup_메인공지 FULL */
-.popup_main_notice {position:fixed; left:0; top:0; right: 0; bottom: 0; z-index:90000; width: 100%; height: 100%; overflow-y:auto; background: #222; z-index: 100;}
+.popup_main_notice {position:fixed; left:0; top:0; right: 0; bottom: 0; z-index:9000; width: 100%; height: 100%; overflow-y:auto; background: #222;}
 .popup_main_notice .swiper-button-prev,
 .popup_main_notice .swiper-button-next {position:absolute; top:50%; transform:translateY(-50%); display:inline-block; width:6.0rem; height:6.0rem; background-image:url('/images/pc/btn_main_pop_arrow.png'); background-repeat:no-repeat; background-size:auto 100%; z-index:2;}
 .popup_main_notice .swiper-button-prev {left:0; background-position:0 50%;}

+ 1 - 1
src/main/webapp/ux/pc/css/common.css

@@ -830,7 +830,7 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemOpt ul li:first-child{margin-left: 0px;}
 .itemOpt .exc{font-size: 14px;line-height: 1.2;display: inline-block;margin-left: 10px;}
 .itemBrand {margin: 0px 5px 12px;line-height: 12px;font-size: 12px;font-weight: 300;color: rgb(137, 137, 137);height:12px;}
-.itemComment{margin:20px 5px 0px;line-height: 1; font-size: 14px;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.itemComment{margin:0px 5px 20px;line-height: 1; font-size: 14px;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .itemName {	margin: 0px 5px 15px;line-height:20px;font-size: 14px;font-weight: 200;color:#222; height:40px;}
 .itemPrice * {margin-right: 7px;}
 .itemPrice {position: relative;line-height: 16px;font-size:16px;font-weight: 300;color: rgb(31, 31, 31);margin: 0px 5px;}

Vissa filer visades inte eftersom för många filer har ändrats