Merge branch 'master' of https://github.com/rubickCenter/rubick

# Conflicts:
#	feature/src/App.vue
#	feature/src/views/market/index.vue
#	feature/src/views/settings/index.vue

feature/src/App.vue

@@ -41,12 +41,12 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import {
   HeartOutlined,
-  UserOutlined,
   AppstoreOutlined,
   SettingOutlined,
   BugOutlined,
 } from '@ant-design/icons-vue';
 import { useStore } from 'vuex';
+
 const router = useRouter();
 const active = ref(['market']);
 const changeMenu = (key: any) => {

feature/src/assets/ant-reset.less

@@ -1,8 +1,3 @@
-@import "~ant-design-vue/dist/antd.less"; // 引入官方提供的 less 样式入口文件
-
-@primary-color: #ff4ea4; // 全局主色
-@error-color: #ff4ea4; // 错误色
-
 :root {
   --color-text-primary: rgba(0, 0, 0, 0.85);
   --color-text-content: #141414;

feature/src/views/market/index.vue

@@ -6,6 +6,7 @@
           v-model:value="searchValue"
           :placeholder="$t('feature.market.search')"
           style="width: 100%"
+          class="search"
           @search="onSearch"
         />
       </div>
@@ -103,7 +104,14 @@ const { searchValue, current } = toRefs(state);
   width: 100%;
   overflow: hidden;
   background: var(--color-menu-bg);
-  height: calc(~'100vh - 46px');
+  height: calc(~"100vh - 46px");
+  .search {
+    :deep(.ant-btn), :deep(.ant-input), :deep(.ant-input-group-addon) {
+      color: var(--ant-primary-color) !important;
+      background: var(--color-input-hover);
+      border-color: var(--color-border-light);
+    }
+  }
   .container {
     background: var(--color-body-bg);
     width: calc(~'100% - 200px');

feature/src/views/settings/index.vue

@@ -485,12 +485,13 @@ const changeLanguage = (value) => {
           font-size: 14px;
           height: 24px;
           font-weight: lighter;
-
+          background: var(--color-input-hover);
           .ant-input {
             text-align: center;
             color: var(--ant-primary-color);
             font-size: 14px;
             font-weight: lighter;
+            background: var(--color-input-hover);
           }
         }