From 9673dcb04ce5e6ddd211383694579fd842e59780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 16 Aug 2017 16:36:17 +0800 Subject: [PATCH] update ColorPicker --- src/components/color-picker/color-picker.vue | 1 + src/styles/components/color-picker.less | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue index 7a62808e..8c2574b1 100644 --- a/src/components/color-picker/color-picker.vue +++ b/src/components/color-picker/color-picker.vue @@ -68,6 +68,7 @@ wrapClasses () { return [ `${prefixCls}-rel`, + `${prefixCls}-${this.size}`, `${inputPrefixCls}-wrapper`, `${inputPrefixCls}-wrapper-${this.size}` ]; diff --git a/src/styles/components/color-picker.less b/src/styles/components/color-picker.less index 8c0991f9..ab441950 100644 --- a/src/styles/components/color-picker.less +++ b/src/styles/components/color-picker.less @@ -5,8 +5,20 @@ line-height: 0; } &-color{ - width: 20px; - height: 100%; + width: 18px; + height: 18px; border: 1px solid @text-color; + position: relative; + top: 2px; + } + &-large &-color{ + width: 20px; + height: 20px; + top: 1px; + } + &-small &-color{ + width: 14px; + height: 14px; + top: 3px; } } \ No newline at end of file