fe / yoho-blk · Commits

Go to a project

Authored by 石坚
Commit fdb159f2133c819423e15cdc03d0c49dcefd36b4 2 parents b5b44f32 2a240d99

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

Inline Side-by-side
Showing 4 changed files with 14 additions and 12 deletions
... ... @@ -106,7 +106,7 @@
{{# brands}}
<div class="brand">
<a class="thumb" href="{{url}}" target="_blank">
<img src="{{thumb}}">
<img src="{{image thumb 100 100 2}}">
</a>
<p class="brand-name">{{name}}</p>
</div>
... ...
... ... @@ -193,7 +193,6 @@ a {
font-size: 24px;
font-family: "iconfont" !important;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.4px;
-moz-osx-font-smoothing: grayscale;
}
... ...
... ... @@ -91,7 +91,7 @@
}
}
.mini-bag-box-wrap{
.mini-bag-box-wrap {
display: none;
}
... ... @@ -298,14 +298,14 @@
}
.sub-nav {
height: 50px;
height: 44px;
background: #1b1b1b;
.sub-nav-list {
max-width: 94%;
display: inline-block;
line-height: 55px;
height: 44px;
line-height: 50px;
font-size: 14px;
li {
float: left;
... ... @@ -417,6 +417,7 @@
left: 0;
display: none;
z-index: 10;
top: 180px;
dl {
float: left;
... ...
... ... @@ -310,7 +310,7 @@
.goods {
margin: 10px 0 16px;
padding: 10px 13px;
padding: 10px;
float: left;
text-align: center;
border: 2px solid #fff;
... ... @@ -318,7 +318,6 @@
width: 289px;
.goods-brand {
font-weight: 700;
padding: 10px 10px 4px;
overflow: hidden;
text-overflow: ellipsis;
... ... @@ -380,7 +379,6 @@
background: #fff;
z-index: 2;
top: 10px;
padding-right: 10px;
min-width: 383px;
display: none;
... ... @@ -390,7 +388,7 @@
}
.goods-img-list {
margin: 2px 0 2px 10px;
margin: 0 10px 2px 4px;
float: left;
.goods-img-col {
... ... @@ -401,12 +399,16 @@
}
.goods-img-col:last-child {
margin-right: 0;
margin-right: 10px;
}
img {
margin-top: 11px;
margin-top: 10px;
cursor: pointer;
&:nth-child(4n) {
margin-top: 11px;
}
}
}
}
... ...