From 6851c0bd060e7c34de9dca63e056d819e4baa90c Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Tue, 18 Apr 2023 17:21:07 +0800 Subject: [PATCH] =?UTF-8?q?mod:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Setting/src/Setting.vue | 2 +- src/components/TabMenu/src/TabMenu.vue | 11 ----------- src/components/TagsView/src/TagsView.vue | 11 ++--------- src/styles/var.css | 8 -------- uno.config.ts | 11 ----------- 5 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/components/Setting/src/Setting.vue b/src/components/Setting/src/Setting.vue index 913833e..014f1a4 100644 --- a/src/components/Setting/src/Setting.vue +++ b/src/components/Setting/src/Setting.vue @@ -47,7 +47,7 @@ const setHeaderTheme = (color: string) => { setCssVar('--top-header-bg-color', color) setCssVar('--top-header-text-color', textColor) setCssVar('--top-header-hover-color', textHoverColor) - setCssVar('--top-tool-border-color', topToolBorderColor) + setCssVar('--layout-border-color', topToolBorderColor) appStore.setTheme({ topHeaderBgColor: color, topHeaderTextColor: textColor, diff --git a/src/components/TabMenu/src/TabMenu.vue b/src/components/TabMenu/src/TabMenu.vue index 5dd6f71..8fcb54d 100644 --- a/src/components/TabMenu/src/TabMenu.vue +++ b/src/components/TabMenu/src/TabMenu.vue @@ -219,16 +219,6 @@ export default defineComponent({ .@{prefix-cls} { transition: all var(--transition-time-02); - &:after { - position: absolute; - top: 0; - right: 0; - width: 1px; - height: 100%; - border-left: 1px solid var(--left-menu-border-color); - content: ''; - } - &__item { color: var(--left-menu-text-color); transition: all var(--transition-time-02); @@ -242,7 +232,6 @@ export default defineComponent({ &--collapse { color: var(--left-menu-text-color); background-color: var(--left-menu-bg-light-color); - border-top: 1px solid var(--left-menu-border-color); } .is-active { diff --git a/src/components/TagsView/src/TagsView.vue b/src/components/TagsView/src/TagsView.vue index 56983aa..ffcab3e 100644 --- a/src/components/TagsView/src/TagsView.vue +++ b/src/components/TagsView/src/TagsView.vue @@ -482,7 +482,7 @@ watch( left: 0; width: 100%; height: calc(~'100% - 1px'); - border-left: 1px solid var(--tags-view-border-color); + border-left: 1px solid var(--layout-border-color); content: ''; } @@ -496,7 +496,7 @@ watch( left: 0; width: 100%; height: calc(~'100% - 1px'); - border-right: 1px solid var(--tags-view-border-color); + border-right: 1px solid var(--layout-border-color); content: ''; } } @@ -560,14 +560,7 @@ watch( } } - &:after { - border-left: 1px solid var(--el-border-color); - } - &--first { - &:before { - border-right: 1px solid var(--el-border-color); - } &:after { display: none; } diff --git a/src/styles/var.css b/src/styles/var.css index 8ab13b2..61895d2 100644 --- a/src/styles/var.css +++ b/src/styles/var.css @@ -2,8 +2,6 @@ --login-bg-color: #293146; /* left menu start */ - --left-menu-border-color: '#eee'; - --left-menu-max-width: 200px; --left-menu-min-width: 64px; @@ -25,8 +23,6 @@ --logo-height: 50px; --logo-title-text-color: #fff; - - --logo-border-color: 'inherit'; /* logo end */ /* header start */ @@ -42,8 +38,6 @@ --layout-border-color: #eee; - --top-tool-border-color: #eee; - --tags-view-height: 35px; --tags-view-border-color: #eee; @@ -55,8 +49,6 @@ --tab-menu-min-width: 30px; --tab-menu-collapse-height: 36px; - - --tab-menu-border-color: #eee; /* tab menu end */ --app-content-padding: 20px; diff --git a/uno.config.ts b/uno.config.ts index ffa558b..8e214e1 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -1,17 +1,6 @@ import { defineConfig, toEscapedSelector as e, presetUno } from 'unocss' import transformerVariantGroup from '@unocss/transformer-variant-group' -const POSITION_MAP = { - t: 'top', - b: 'bottom', - l: 'left', - r: 'right', - top: 'top', - bottom: 'bottom', - left: 'left', - right: 'right' -} - export default defineConfig({ // ...UnoCSS options rules: [