diff --git a/components.d.ts b/components.d.ts index 7a4d6b4f..100f2696 100644 --- a/components.d.ts +++ b/components.d.ts @@ -48,9 +48,11 @@ declare module 'vue' { Input: typeof import('./src/components/Input.vue')['default'] List: typeof import('./src/components/list/List.vue')['default'] ListItem: typeof import('./src/components/list/ListItem.vue')['default'] + Logo: typeof import('./src/components/Logo.vue')['default'] MiniDialog: typeof import('./src/components/dialog/MiniDialog.vue')['default'] PopConfirm: typeof import('./src/components/PopConfirm.vue')['default'] RepeatSetting: typeof import('./src/components/Toolbar/RepeatSetting.vue')['default'] + RightTopBar: typeof import('./src/components/RightTopBar.vue')['default'] Ring: typeof import('./src/components/Ring.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/public/logo-text-black.png b/public/logo-text-black.png new file mode 100644 index 00000000..7e540d5d Binary files /dev/null and b/public/logo-text-black.png differ diff --git a/public/logo-text-white.png b/public/logo-text-white.png new file mode 100644 index 00000000..0cfdb5e5 Binary files /dev/null and b/public/logo-text-white.png differ diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index dbda6693..9cabd80c 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -9,6 +9,7 @@ --color-background: #E6E8EB; --color-main-bg: #E6E8EB; --color-second-bg: rgb(240, 242, 244); + --color-third-bg: rgb(213, 215, 217); --color-item-bg: rgb(228, 230, 232); --color-item-hover: white; @@ -44,19 +45,14 @@ --color-textarea-bg: white; - --font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; --word-font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; } html.dark { - //--color-main-bg: rgba(0, 5, 24, 1); - //--color-main-bg: rgba(17,24,39, 1); - //--color-background: transparent; --color-main-bg: rgba(14, 18, 23, 1); - //--color-main-bg: rgba(30,31,34, 1); - --color-second-bg: rgb(43, 45, 48); --color-second-bg: rgb(30, 31, 34); + --color-third-bg: rgb(43, 45, 48); --color-item-bg: rgb(43, 45, 48); --color-item-hover: rgb(67, 69, 74); diff --git a/src/components/Logo.vue b/src/components/Logo.vue new file mode 100644 index 00000000..db49fb2b --- /dev/null +++ b/src/components/Logo.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/src/components/RightTopBar.vue b/src/components/RightTopBar.vue new file mode 100644 index 00000000..4bc9c772 --- /dev/null +++ b/src/components/RightTopBar.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/src/components/list/DictItem.vue b/src/components/list/DictItem.vue index 6dbbd768..bfc033f3 100644 --- a/src/components/list/DictItem.vue +++ b/src/components/list/DictItem.vue @@ -46,7 +46,8 @@ const emit = defineEmits<{ height: 165rem; border-radius: 10rem; position: relative; - background: var(--color-item-bg); + background: var(--color-third-bg); + border: 1px solid var(--color-item-border); color: var(--color-font-1); font-size: 14rem; display: flex; diff --git a/src/pages/dict/index.vue b/src/pages/dict/index.vue index fe7eccf7..7604f6d8 100644 --- a/src/pages/dict/index.vue +++ b/src/pages/dict/index.vue @@ -4,6 +4,8 @@ import DictManage from "@/pages/dict/DictManage.vue"; import {onMounted} from "vue"; import {useRoute} from "vue-router"; import {useRuntimeStore} from "@/stores/runtime.ts"; +import RightTopBar from "@/components/RightTopBar.vue"; +import Logo from "@/components/Logo.vue"; const router = useRoute() const runtimeStore = useRuntimeStore() @@ -13,8 +15,9 @@ onMounted(() => {