Commit 28cacec905e8281c73d96aaa3c51a9e784b38953
Merge remote-tracking branch 'origin/wynn'
Showing
1 changed file
with
10 additions
and
6 deletions
Show diff stats
src/styles/components/switch.less
| @@ -7,8 +7,7 @@ | @@ -7,8 +7,7 @@ | ||
| 7 | line-height: 20px; | 7 | line-height: 20px; |
| 8 | border-radius: 22px; | 8 | border-radius: 22px; |
| 9 | vertical-align: middle; | 9 | vertical-align: middle; |
| 10 | - /*wynn*/ | ||
| 11 | - border: 1px solid @mew-common-color; | 10 | + border: 1px solid tint(@mew-common-color, 20%); |
| 12 | background-color: #efefef; | 11 | background-color: #efefef; |
| 13 | position: relative; | 12 | position: relative; |
| 14 | cursor: pointer; | 13 | cursor: pointer; |
| @@ -20,7 +19,7 @@ | @@ -20,7 +19,7 @@ | ||
| 20 | } | 19 | } |
| 21 | 20 | ||
| 22 | &-inner { | 21 | &-inner { |
| 23 | - color: @mew-common-color; | 22 | + color: #999; |
| 24 | font-size: @font-size-small; | 23 | font-size: @font-size-small; |
| 25 | position: absolute; | 24 | position: absolute; |
| 26 | left: 23px; | 25 | left: 23px; |
| @@ -40,7 +39,7 @@ | @@ -40,7 +39,7 @@ | ||
| 40 | width: 18px; | 39 | width: 18px; |
| 41 | height: 18px; | 40 | height: 18px; |
| 42 | border-radius: 18px; | 41 | border-radius: 18px; |
| 43 | - background-color: @mew-common-color; | 42 | + background-color: tint(@mew-common-color, 50%); |
| 44 | position: absolute; | 43 | position: absolute; |
| 45 | left: 1px; | 44 | left: 1px; |
| 46 | top: 1px; | 45 | top: 1px; |
| @@ -65,7 +64,7 @@ | @@ -65,7 +64,7 @@ | ||
| 65 | top: 3px; | 64 | top: 3px; |
| 66 | z-index: 1; | 65 | z-index: 1; |
| 67 | border: 1px solid @mew-common-color; | 66 | border: 1px solid @mew-common-color; |
| 68 | - border-color: transparent transparent transparent #3fcdc0; | 67 | + border-color: transparent transparent transparent @mew-common-color; |
| 69 | animation: switch-loading 1s linear; | 68 | animation: switch-loading 1s linear; |
| 70 | animation-iteration-count: infinite; | 69 | animation-iteration-count: infinite; |
| 71 | } | 70 | } |
| @@ -75,7 +74,7 @@ | @@ -75,7 +74,7 @@ | ||
| 75 | 74 | ||
| 76 | /*wynn*/ | 75 | /*wynn*/ |
| 77 | &:focus { | 76 | &:focus { |
| 78 | - box-shadow: 0 0 0 2px fade(@mew-common-color, 20%); | 77 | + box-shadow: 0 0 0 2px fade(@mew-common-color, 5%); |
| 79 | outline: 0; | 78 | outline: 0; |
| 80 | } | 79 | } |
| 81 | 80 | ||
| @@ -145,6 +144,7 @@ | @@ -145,6 +144,7 @@ | ||
| 145 | } | 144 | } |
| 146 | 145 | ||
| 147 | &:after { | 146 | &:after { |
| 147 | + background-color: @mew-common-color; | ||
| 148 | left: 23px; | 148 | left: 23px; |
| 149 | } | 149 | } |
| 150 | &:before{ | 150 | &:before{ |
| @@ -154,6 +154,10 @@ | @@ -154,6 +154,10 @@ | ||
| 154 | &:active:after { | 154 | &:active:after { |
| 155 | left: 15px; | 155 | left: 15px; |
| 156 | } | 156 | } |
| 157 | + | ||
| 158 | + .@{switch-prefix-cls}-inner { | ||
| 159 | + color: @mew-common-color; | ||
| 160 | + } | ||
| 157 | } | 161 | } |
| 158 | 162 | ||
| 159 | &-disabled { | 163 | &-disabled { |