From dab3947668250ac3a0f8a72a11497fce7b3c7038 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 17 Aug 2017 10:54:44 +0800
Subject: [PATCH] update ColorPicker
---
src/components/color-picker/color-picker.vue | 2 +-
src/styles/components/color-picker.less | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 838576a..bf6c0f7 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -16,7 +16,7 @@
<Slider v-model="alphaNumber" :min="0" :max="100"></Slider>
</div>
<recommend-colors v-if="colors.length" :list="colors" :class="[prefixCls + '-picker-colors']"></recommend-colors>
- <recommend-colors v-if="!colors.length && recommend" :list="recommendedColor" :class="[prefixCls + '-picker-colors', prefixCls + '-picker-colors-recommended']"></recommend-colors>
+ <recommend-colors v-if="!colors.length && recommend" :list="recommendedColor" :class="[prefixCls + '-picker-colors']"></recommend-colors>
<Confirm></Confirm>
</div>
</Dropdown-menu>
diff --git a/src/styles/components/color-picker.less b/src/styles/components/color-picker.less
index 7259b2d..cbef8aa 100644
--- a/src/styles/components/color-picker.less
+++ b/src/styles/components/color-picker.less
@@ -7,7 +7,8 @@
&-color{
width: 18px;
height: 18px;
- border: 1px solid @text-color;
+ box-shadow: inset 0 0 0 1px rgba(0,0,0,.15);
+ border-radius: 2px;
position: relative;
top: 2px;
}
@@ -47,17 +48,12 @@
display: block;
width: 16px;
height: 16px;
- border: 1px solid transparent;
cursor: pointer;
border-radius: 2px;
+ box-shadow: inset 0 0 0 1px rgba(0,0,0,.15);
}
}
}
- &-colors-recommended{
- span:last-child em{
- border: 1px solid #6b6f78;
- }
- }
.@{picker-prefix-cls}-confirm{
margin-top: 8px;
}
--
libgit2 0.21.4