Commit 5d875bda1e9b97536157926d5179c72ec39805a3
Merge remote-tracking branch 'origin/wynn'
Showing
2 changed files
with
9 additions
and
9 deletions
Show diff stats
src/styles/components/button.less
| @@ -164,8 +164,8 @@ | @@ -164,8 +164,8 @@ | ||
| 164 | color: #333; | 164 | color: #333; |
| 165 | border-color: @border-color-base; | 165 | border-color: @border-color-base; |
| 166 | &:hover { | 166 | &:hover { |
| 167 | - color: #3fcdc0; | ||
| 168 | - border-color: #3fcdc0; | 167 | + color: #333; |
| 168 | + border-color: @search-hover-color; | ||
| 169 | } | 169 | } |
| 170 | } | 170 | } |
| 171 | &-ghost&-primary{ | 171 | &-ghost&-primary{ |
| @@ -209,7 +209,7 @@ | @@ -209,7 +209,7 @@ | ||
| 209 | color: #fff; | 209 | color: #fff; |
| 210 | &:hover{ | 210 | &:hover{ |
| 211 | color: #fff; | 211 | color: #fff; |
| 212 | - background: #15bcad; | 212 | + background: @search-hover-color; |
| 213 | } | 213 | } |
| 214 | } | 214 | } |
| 215 | 215 | ||
| @@ -217,7 +217,7 @@ | @@ -217,7 +217,7 @@ | ||
| 217 | color: #fff; | 217 | color: #fff; |
| 218 | &:hover { | 218 | &:hover { |
| 219 | color: #fff; | 219 | color: #fff; |
| 220 | - background: #ff903a; | 220 | + background: @confirm-hover-color; |
| 221 | } | 221 | } |
| 222 | } | 222 | } |
| 223 | 223 | ||
| @@ -225,8 +225,8 @@ | @@ -225,8 +225,8 @@ | ||
| 225 | color: #333; | 225 | color: #333; |
| 226 | border-color: @border-color-base; | 226 | border-color: @border-color-base; |
| 227 | &:hover { | 227 | &:hover { |
| 228 | - color: #ff9a4c; | ||
| 229 | - border-color: #ff903a; | 228 | + color: @confirm-hover-color; |
| 229 | + border-color: @confirm-hover-color; | ||
| 230 | } | 230 | } |
| 231 | } | 231 | } |
| 232 | 232 | ||
| @@ -234,8 +234,8 @@ | @@ -234,8 +234,8 @@ | ||
| 234 | color: #333; | 234 | color: #333; |
| 235 | border-color: @border-color-base; | 235 | border-color: @border-color-base; |
| 236 | &:hover { | 236 | &:hover { |
| 237 | - color: #15bcad; | ||
| 238 | - border-color: #15bcad; | 237 | + color: @reset-hover-color; |
| 238 | + border-color: @reset-hover-color; | ||
| 239 | } | 239 | } |
| 240 | } | 240 | } |
| 241 | 241 |
src/styles/mixins/button.less
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | &:hover | 206 | &:hover |
| 207 | //&:focus | 207 | //&:focus |
| 208 | { | 208 | { |
| 209 | - .button-color(tint(@search-color, 20%); white; tint(@search-color, 20%)); | 209 | + .button-color(tint(@search-hover-color, 20%); white; tint(@search-hover-color, 20%)); |
| 210 | } | 210 | } |
| 211 | &:active, | 211 | &:active, |
| 212 | &.active { | 212 | &.active { |