add ThemePicker to setting

src/layout/components/Navbar.vue

@@ -18,9 +18,6 @@
 
         <lang-select class="right-menu-item hover-effect" />
 
-        <el-tooltip :content="$t('navbar.theme')" effect="dark" placement="bottom">
-          <theme-picker class="right-menu-item hover-effect" />
-        </el-tooltip>
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
@@ -56,7 +53,6 @@ import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import LangSelect from '@/components/LangSelect'
-import ThemePicker from '@/components/ThemePicker'
 import Search from '@/components/HeaderSearch'
 
 export default {
@@ -67,7 +63,6 @@ export default {
     Screenfull,
     SizeSelect,
     LangSelect,
-    ThemePicker,
     Search
   },
   computed: {

src/layout/components/Settings/index.vue

@@ -6,20 +6,23 @@
       </h3>
 
       <div class="drawer-item">
-        <span>开启  Tags-View</span>
+        <span>开启 Tags-View</span>
         <el-switch v-model="tagsView" class="drawer-switch" />
       </div>
 
-      <!-- <div class="drawer-item">
-        <span>显示 Logo</span>
-        <el-switch v-model="sidebarLogo" class="drawer-switch" />
-      </div> -->
+      <div class="drawer-item">
+        <span>主题色</span>
+        <theme-picker style="float: right;height: 26px;margin: -3px 5px 0 0;" />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import ThemePicker from '@/components/ThemePicker'
+
 export default {
+  components: { ThemePicker },
   data() {
     return {
       sidebarLogo: true