Commit 9673dcb04ce5e6ddd211383694579fd842e59780
1 parent
b6bda1dc
update ColorPicker
Showing
2 changed files
with
15 additions
and
2 deletions
Show diff stats
src/components/color-picker/color-picker.vue
| @@ -68,6 +68,7 @@ | @@ -68,6 +68,7 @@ | ||
| 68 | wrapClasses () { | 68 | wrapClasses () { |
| 69 | return [ | 69 | return [ |
| 70 | `${prefixCls}-rel`, | 70 | `${prefixCls}-rel`, |
| 71 | + `${prefixCls}-${this.size}`, | ||
| 71 | `${inputPrefixCls}-wrapper`, | 72 | `${inputPrefixCls}-wrapper`, |
| 72 | `${inputPrefixCls}-wrapper-${this.size}` | 73 | `${inputPrefixCls}-wrapper-${this.size}` |
| 73 | ]; | 74 | ]; |
src/styles/components/color-picker.less
| @@ -5,8 +5,20 @@ | @@ -5,8 +5,20 @@ | ||
| 5 | line-height: 0; | 5 | line-height: 0; |
| 6 | } | 6 | } |
| 7 | &-color{ | 7 | &-color{ |
| 8 | - width: 20px; | ||
| 9 | - height: 100%; | 8 | + width: 18px; |
| 9 | + height: 18px; | ||
| 10 | border: 1px solid @text-color; | 10 | border: 1px solid @text-color; |
| 11 | + position: relative; | ||
| 12 | + top: 2px; | ||
| 13 | + } | ||
| 14 | + &-large &-color{ | ||
| 15 | + width: 20px; | ||
| 16 | + height: 20px; | ||
| 17 | + top: 1px; | ||
| 18 | + } | ||
| 19 | + &-small &-color{ | ||
| 20 | + width: 14px; | ||
| 21 | + height: 14px; | ||
| 22 | + top: 3px; | ||
| 11 | } | 23 | } |
| 12 | } | 24 | } |
| 13 | \ No newline at end of file | 25 | \ No newline at end of file |