Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
1 changed file
with
7 additions
and
3 deletions
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | display: inline-block; | 23 | display: inline-block; |
24 | max-width: pxToRem(380px); | 24 | max-width: pxToRem(380px); |
25 | overflow: hidden; | 25 | overflow: hidden; |
26 | - text-overflow: ellipsis; | 26 | + text-overflow: ellipsis; |
27 | white-space: nowrap; | 27 | white-space: nowrap; |
28 | } | 28 | } |
29 | 29 | ||
@@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
40 | font-size: pxToRem(40px); | 40 | font-size: pxToRem(40px); |
41 | line-height: pxToRem(60px); | 41 | line-height: pxToRem(60px); |
42 | text-align: right; | 42 | text-align: right; |
43 | - | 43 | + |
44 | .edit, | 44 | .edit, |
45 | .del { | 45 | .del { |
46 | display: inline-block; | 46 | display: inline-block; |
@@ -48,6 +48,10 @@ | @@ -48,6 +48,10 @@ | ||
48 | width: pxToRem(60px); | 48 | width: pxToRem(60px); |
49 | height: pxToRem(60px); | 49 | height: pxToRem(60px); |
50 | color: #999; | 50 | color: #999; |
51 | + | ||
52 | + &:hover { | ||
53 | + color: #666; | ||
54 | + } | ||
51 | } | 55 | } |
52 | 56 | ||
53 | .edit { | 57 | .edit { |
@@ -212,7 +216,7 @@ | @@ -212,7 +216,7 @@ | ||
212 | float: right; | 216 | float: right; |
213 | color: #d0d0d0; | 217 | color: #d0d0d0; |
214 | } | 218 | } |
215 | - | 219 | + |
216 | &.highlight { | 220 | &.highlight { |
217 | background: #eee; | 221 | background: #eee; |
218 | } | 222 | } |
-
Please register or login to post a comment