drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update ColorPicker

Browse source
This commit is contained in:
梁灏 2017-08-17 10:54:44 +08:00
parent 9af2f01cb2
commit dab3947668
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/color-picker/color-picker.vue
View file

@ -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>

10
src/styles/components/color-picker.less
View file

@ -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;
}