Commit dab3947668250ac3a0f8a72a11497fce7b3c7038
1 parent
9af2f01c
update ColorPicker
Showing
2 changed files
with
4 additions
and
8 deletions
Show diff stats
src/components/color-picker/color-picker.vue
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | <Slider v-model="alphaNumber" :min="0" :max="100"></Slider> |
| 17 | 17 | </div> |
| 18 | 18 | <recommend-colors v-if="colors.length" :list="colors" :class="[prefixCls + '-picker-colors']"></recommend-colors> |
| 19 | - <recommend-colors v-if="!colors.length && recommend" :list="recommendedColor" :class="[prefixCls + '-picker-colors', prefixCls + '-picker-colors-recommended']"></recommend-colors> | |
| 19 | + <recommend-colors v-if="!colors.length && recommend" :list="recommendedColor" :class="[prefixCls + '-picker-colors']"></recommend-colors> | |
| 20 | 20 | <Confirm></Confirm> |
| 21 | 21 | </div> |
| 22 | 22 | </Dropdown-menu> | ... | ... |
src/styles/components/color-picker.less
| ... | ... | @@ -7,7 +7,8 @@ |
| 7 | 7 | &-color{ |
| 8 | 8 | width: 18px; |
| 9 | 9 | height: 18px; |
| 10 | - border: 1px solid @text-color; | |
| 10 | + box-shadow: inset 0 0 0 1px rgba(0,0,0,.15); | |
| 11 | + border-radius: 2px; | |
| 11 | 12 | position: relative; |
| 12 | 13 | top: 2px; |
| 13 | 14 | } |
| ... | ... | @@ -47,17 +48,12 @@ |
| 47 | 48 | display: block; |
| 48 | 49 | width: 16px; |
| 49 | 50 | height: 16px; |
| 50 | - border: 1px solid transparent; | |
| 51 | 51 | cursor: pointer; |
| 52 | 52 | border-radius: 2px; |
| 53 | + box-shadow: inset 0 0 0 1px rgba(0,0,0,.15); | |
| 53 | 54 | } |
| 54 | 55 | } |
| 55 | 56 | } |
| 56 | - &-colors-recommended{ | |
| 57 | - span:last-child em{ | |
| 58 | - border: 1px solid #6b6f78; | |
| 59 | - } | |
| 60 | - } | |
| 61 | 57 | .@{picker-prefix-cls}-confirm{ |
| 62 | 58 | margin-top: 8px; |
| 63 | 59 | } | ... | ... |