Authored by yyq

Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

... ... @@ -38,8 +38,6 @@ const _processListData = (list) => {
}
});
console.log(list)
listKey.sort();
listKey.push('0-9');
... ...
.brand-text-box {
$size: 18px;
$size: 14px;
$line-height: 1.8;
$lines-to-show: 3;
... ... @@ -13,7 +13,7 @@
h4 {
height: 18px;
line-height: 18px;
padding-right: 10px;
padding-right: 20px;
display: -webkit-box;
font-size: 16px;
font-weight: bold;
... ... @@ -26,7 +26,7 @@
display: -webkit-box;
height: calc($size*$line-height*$lines-to-show);
margin: 25px 0;
padding-right: 25px;
padding-right: 20px;
font-size: $size;
line-height: $line-height;
overflow: hidden;
... ...
... ... @@ -33,7 +33,7 @@
min-height: 50px;
padding: $space;
position: absolute;
bottom: 2px;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
color: #fff;
font-size: 14px;
... ...
... ... @@ -25,7 +25,7 @@
@extend .cursor-pointer;
padding-bottom: 3px;
border-bottom: 1px solid #000;
border-bottom: 2px solid #000;
&.top {
line-height: 30px;
... ...
... ... @@ -51,7 +51,6 @@
margin: 15px 0;
padding-right: $space;
font-size: $size;
font-weight: bold;
line-height: $line-height;
overflow: hidden;
-webkit-line-clamp: $lines-to-show;
... ...