Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
1 changed file
with
8 additions
and
3 deletions
@@ -16,9 +16,9 @@ | @@ -16,9 +16,9 @@ | ||
16 | 16 | ||
17 | input { | 17 | input { |
18 | height: 56rem / $pxConvertRem; | 18 | height: 56rem / $pxConvertRem; |
19 | - width: 430rem / $pxConvertRem; | 19 | + width: 378rem / $pxConvertRem; |
20 | border-radius: 28rem / $pxConvertRem; | 20 | border-radius: 28rem / $pxConvertRem; |
21 | - padding-left: 52rem / $pxConvertRem; | 21 | + padding: 0 52rem / $pxConvertRem; |
22 | font-size: 24rem / $pxConvertRem; | 22 | font-size: 24rem / $pxConvertRem; |
23 | background: #fff; | 23 | background: #fff; |
24 | border: none; | 24 | border: none; |
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | 26 | ||
27 | .clear-input { | 27 | .clear-input { |
28 | position: absolute; | 28 | position: absolute; |
29 | - top: 24rem / $pxConvertRem; | 29 | + top: 20rem / $pxConvertRem; |
30 | right: 145rem / $pxConvertRem; | 30 | right: 145rem / $pxConvertRem; |
31 | font-size: 32rem / $pxConvertRem; | 31 | font-size: 32rem / $pxConvertRem; |
32 | color: #666; | 32 | color: #666; |
@@ -56,6 +56,8 @@ | @@ -56,6 +56,8 @@ | ||
56 | float: left; | 56 | float: left; |
57 | margin-right: 20rem / $pxConvertRem; | 57 | margin-right: 20rem / $pxConvertRem; |
58 | margin-bottom: 20rem / $pxConvertRem; | 58 | margin-bottom: 20rem / $pxConvertRem; |
59 | + max-width: 100%; | ||
60 | + overflow: hidden; | ||
59 | } | 61 | } |
60 | 62 | ||
61 | a { | 63 | a { |
@@ -66,6 +68,9 @@ | @@ -66,6 +68,9 @@ | ||
66 | font-size: 28rem / $pxConvertRem; | 68 | font-size: 28rem / $pxConvertRem; |
67 | background: #f8f8f8; | 69 | background: #f8f8f8; |
68 | color: #000; | 70 | color: #000; |
71 | + overflow: hidden; | ||
72 | + text-overflow: ellipsis; | ||
73 | + white-space: nowrap; | ||
69 | } | 74 | } |
70 | 75 | ||
71 | .clear-history { | 76 | .clear-history { |
-
Please register or login to post a comment