Merge branch 'release/5.3.1' into 'gray'
hot line-height See merge request !92
Showing
1 changed file
with
8 additions
and
6 deletions
| 1 | .search-page { | 1 | .search-page { |
| 2 | + ::-webkit-scrollbar { | ||
| 3 | + width: 0; | ||
| 4 | + height: 0; | ||
| 5 | + } | ||
| 6 | + | ||
| 2 | .search-input { | 7 | .search-input { |
| 3 | position: relative; | 8 | position: relative; |
| 4 | padding: 14px 22px; | 9 | padding: 14px 22px; |
| @@ -51,13 +56,13 @@ | @@ -51,13 +56,13 @@ | ||
| 51 | width: 100%; | 56 | width: 100%; |
| 52 | overflow-x: auto; | 57 | overflow-x: auto; |
| 53 | border-bottom: 1px solid #e0e0e0; | 58 | border-bottom: 1px solid #e0e0e0; |
| 54 | - height: 115px; | ||
| 55 | 59 | ||
| 56 | .new-hot { | 60 | .new-hot { |
| 57 | background: #fff; | 61 | background: #fff; |
| 58 | padding-left: 30px; | 62 | padding-left: 30px; |
| 59 | - height: 110px; | ||
| 60 | padding-top: 25px; | 63 | padding-top: 25px; |
| 64 | + padding-bottom: 25px; | ||
| 65 | + line-height: 0; | ||
| 61 | } | 66 | } |
| 62 | 67 | ||
| 63 | .hot-term { | 68 | .hot-term { |
| @@ -75,7 +80,7 @@ | @@ -75,7 +80,7 @@ | ||
| 75 | background: #fff; | 80 | background: #fff; |
| 76 | font-size: 0.7rem; | 81 | font-size: 0.7rem; |
| 77 | width: auto; | 82 | width: auto; |
| 78 | - margin-right: 15px; | 83 | + margin-right: 15px; |
| 79 | } | 84 | } |
| 80 | 85 | ||
| 81 | .hot-title { | 86 | .hot-title { |
| @@ -84,7 +89,6 @@ | @@ -84,7 +89,6 @@ | ||
| 84 | border: none; | 89 | border: none; |
| 85 | padding: 0; | 90 | padding: 0; |
| 86 | } | 91 | } |
| 87 | - | ||
| 88 | } | 92 | } |
| 89 | 93 | ||
| 90 | .search-items { | 94 | .search-items { |
| @@ -121,7 +125,6 @@ | @@ -121,7 +125,6 @@ | ||
| 121 | border-top: 1px solid #e0e0e0; | 125 | border-top: 1px solid #e0e0e0; |
| 122 | background: #fff; | 126 | background: #fff; |
| 123 | padding: 30px; | 127 | padding: 30px; |
| 124 | - /*margin-top: 30px;*/ | ||
| 125 | } | 128 | } |
| 126 | 129 | ||
| 127 | .clear-icon { | 130 | .clear-icon { |
| @@ -152,7 +155,6 @@ | @@ -152,7 +155,6 @@ | ||
| 152 | } | 155 | } |
| 153 | } | 156 | } |
| 154 | 157 | ||
| 155 | - | ||
| 156 | .search-content-title { | 158 | .search-content-title { |
| 157 | height: 40px; | 159 | height: 40px; |
| 158 | 160 |
-
Please register or login to post a comment