Browse Source

Merge remote-tracking branch 'remotes/origin/developer' into developerC

chao 4 years ago
parent
commit
19987d656b
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/main/resources/static/css/activity/activityTopic.css

+ 2 - 2
src/main/resources/static/css/activity/activityTopic.css

@@ -92,7 +92,7 @@ a:hover{color:#333}
 .product-template .floor-item-ad{position:relative;display:block;float:left;margin:16px 16px 0 0}
 .product-template .floor-item-ad img{width:100%;height:100%}
 .product-template .floor-item-ad:hover::after{left:0;top:0;z-index:9;content:'';position:absolute;display:block;width:100%;height:100%;background:rgba(0,0,0,0.1);-webkit-animation:my-fade-ease ease-in-out 0.4s;animation:my-fade-ease ease-in-out 0.4s}
-.product-template .floor-item{float:left;position:relative;width:164px;height:263.57143px;margin:16px 16px 0 0;background:#fff}
+.product-template .floor-item{float:left;position:relative;width:164px;height:268px;margin:16px 16px 0 0;background:#fff}
 .product-template .floor-item .floor-item-cover{width:164px;height:164px}
 .product-template .floor-item .floor-item-cover img{width:100%;height:100%}
 .product-template .floor-item:hover{-webkit-transform:translateY(-5px);-ms-transform:translateY(-5px);transform:translateY(-5px);-webkit-box-shadow:0 4px 8px rgba(102,102,102,0.1);box-shadow:0 4px 8px rgba(102,102,102,0.1)}
@@ -104,7 +104,7 @@ a:hover{color:#333}
 .product-template .floor-item .floor-item-text .pro-title .tag{width:44px;height:18px;line-height:18px;font-size:12px;display:inline-block;margin-right:5px;text-align:center;color:#ffffff !important;background-image:-webkit-gradient(linear,right top,left top,from(#f9c023),to(#f83600));background-image:-o-linear-gradient(right,#f9c023 0%,#f83600 100%);background-image:linear-gradient(270deg,#f9c023 0%,#f83600 100%);border-radius:0px 10px 0px 0px;margin-top:2px}
 .product-template .floor-item .floor-item-text .pro-price{bottom:0;line-height:22px}
 .product-template .floor-item .floor-item-text .pro-price span{vertical-align:middle}
-.product-template .floor-item .floor-item-text .pro-price .price-tag{height:22px;margin:4px 0 ;}
+.product-template .floor-item .floor-item-text .pro-price .price-tag{height:22px;margin:2px 0 ;}
 .product-template .floor-item .floor-item-text .pro-price .price-tag .tag{display:inline-block;height:20px;line-height:20px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#e15616;cursor:pointer;background:#fff;padding:0 4px;position:relative;font-style:normal}
 .product-template.floor-grid-1 .floor-main{height:604.42857px;overflow:hidden}
 .product-template.floor-grid-1 .floor-item-ad.ad1{width:100%;height:117.14286px;margin-right:0}