Merge branch 'master' into deploy

2019-03-21 11:21:11 +08:00 · 2019-03-21 11:21:11 +08:00 · 3905ce454d
parent 082b62e960 63dba8b7d8
commit 3905ce454d
1 changed files with 1 additions and 0 deletions
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@ -1,6 +1,7 @@
 <template>
  <el-color-picker
    v-model="theme"
+    :predefine="['#409EFF', '#11a983', '#13c2c2', '#6959CD', '#f5222d', '#eb2f96', '#DB7093', '#e6a23c', '#8B8989', '#212121']"
    class="theme-picker"
    popper-class="theme-picker-dropdown"
  />