Commit 2bfebe0c768f7dab3a899961fb4549bfea625ee0

Authored by chenhaodong
1 parent e601e496

fix

src/components/button/button.vue
... ... @@ -19,6 +19,7 @@
19 19 props: {
20 20 type: {
21 21 validator (value) {
  22 + /*wynn*/
22 23 return oneOf(value, ['default', 'primary', 'dashed', 'text', 'info', 'success', 'warning', 'error', 'search', 'confirm', 'cancel', 'reset']);
23 24 },
24 25 default: 'default'
... ...
src/styles/components/button.less
... ... @@ -93,6 +93,7 @@
93 93 .btn-circle(@btn-prefix-cls);
94 94 }
95 95  
  96 + /*wynn*/
96 97 &-search {
97 98 .btn-color(@search-color);
98 99 }
... ... @@ -109,6 +110,7 @@
109 110 .btn-color(@reset-color);
110 111 }
111 112  
  113 +
112 114 &:before {
113 115 position: absolute;
114 116 top: -1px;
... ... @@ -194,6 +196,7 @@
194 196 }
195 197 }
196 198  
  199 + /*wynn*/
197 200 &-search {
198 201 color: #fff;
199 202 &:hover{
... ... @@ -228,6 +231,7 @@
228 231 }
229 232 }
230 233  
  234 +
231 235 &-ghost&-default[disabled], &-ghost&-dashed[disabled], &-ghost&-primary[disabled], &-ghost&-info[disabled], &-ghost&-success[disabled], &-ghost&-warning[disabled], &-ghost&-error[disabled], &-ghost&-search[disabled], &-ghost&-confirm[disabled], &-ghost&-cancel[disabled], &-ghost&-reset[disabled]{
232 236 background: transparent;
233 237 color: fade(#000, 25%);
... ...
src/styles/components/input.less
... ... @@ -160,6 +160,7 @@
160 160 &-with-search{
161 161 &:hover{
162 162 .@{input-prefix-cls} {
  163 + /*wynn*/
163 164 border-color: #000;
164 165 }
165 166 }
... ...
src/styles/components/switch.less
... ... @@ -7,6 +7,7 @@
7 7 line-height: 20px;
8 8 border-radius: 22px;
9 9 vertical-align: middle;
  10 + /*wynn*/
10 11 border: 1px solid @mew-common-color;
11 12 background-color: #efefef;
12 13 position: relative;
... ... @@ -33,6 +34,7 @@
33 34 }
34 35 }
35 36  
  37 + /*wynn*/
36 38 &:after {
37 39 content: '';
38 40 width: 18px;
... ... @@ -50,6 +52,7 @@
50 52 width: 26px;
51 53 }
52 54  
  55 + /*wynn*/
53 56 &:before{
54 57 content: '';
55 58 display: none;
... ... @@ -70,6 +73,7 @@
70 73 display: block;
71 74 }
72 75  
  76 + /*wynn*/
73 77 &:focus {
74 78 box-shadow: 0 0 0 2px fade(@mew-common-color, 20%);
75 79 outline: 0;
... ... @@ -131,6 +135,7 @@
131 135 left: 23px;
132 136 }
133 137  
  138 + /*wynn*/
134 139 &-checked {
135 140 border-color: @mew-common-color;
136 141 background-color: #e8e8e8;
... ... @@ -165,6 +170,7 @@
165 170 }
166 171 }
167 172  
  173 + /*wynn*/
168 174 &-disabled&-checked{
169 175 border-color: @mew-common-color;
170 176 background-color: #e8e8e8;
... ...
src/styles/components/tabs.less
... ... @@ -11,6 +11,7 @@
11 11 outline: none;
12 12 }
13 13  
  14 + /*wynn*/
14 15 &-ink-bar {
15 16 height: 2px;
16 17 box-sizing: border-box;
... ... @@ -124,6 +125,7 @@
124 125 position: relative;
125 126 transition: color .3s @ease-in-out;
126 127  
  128 + /*wynn*/
127 129 &:hover {
128 130 color: @mew-common-color;
129 131 }
... ... @@ -138,6 +140,7 @@
138 140 }
139 141 }
140 142  
  143 + /*wynn*/
141 144 .@{tabs-prefix-cls}-tab-active {
142 145 color: @mew-common-color;
143 146 }
... ...
src/styles/custom.less
... ... @@ -15,11 +15,13 @@
15 15 @link-color : #2D8cF0;
16 16 @link-hover-color : tint(@link-color, 20%);
17 17 @link-active-color : shade(@link-color, 5%);
  18 +/*wynn*/
18 19 @selected-color : fade(#ff9a4c, 90%);
19 20 @tooltip-color : #fff;
20 21 @subsidiary-color : #808695;
21 22 @rate-star-color : #f5a623;
22 23  
  24 +/*wynn*/
23 25 // 自定义theme
24 26 @mew-common-color : #3fcdc0;
25 27 @mew-white-color : #fff;
... ...