diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 7410b6fb8d0d12b3bef86d81b0a9ccd1924a125d..44e7e3ed667a7fe3f4d31d0f0256a80866c36d2e 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -65,7 +65,7 @@ } .svg-icon { - margin-right: 16px; + margin-right: 10px; } .el-menu { @@ -88,12 +88,16 @@ // menu hover .theme-dark .sub-menu-title-noDropdown, .theme-dark .el-sub-menu__title { + border-radius: 8px; + margin: 1px 5px 1px 5px; &:hover { background-color: $base-sub-menu-title-hover !important; } } .sub-menu-title-noDropdown, .el-sub-menu__title { + border-radius: 8px; + margin: 1px 5px 1px 5px; &:hover { background-color: rgba(0, 0, 0, 0.05) !important; } @@ -105,8 +109,11 @@ & .nest-menu .el-sub-menu > .el-sub-menu__title, & .el-sub-menu .el-menu-item { - min-width: $base-sidebar-width !important; - &:hover { + min-width: calc($base-sidebar-width - 20px) !important; + border-radius: 8px; + height: 45px; + margin: 1px 8px 1px 8px; + &:not(.is-active):hover { background-color: rgba(0, 0, 0, 0.1) !important; } } @@ -114,22 +121,47 @@ & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title, & .theme-dark .el-sub-menu .el-menu-item { background-color: $base-sub-menu-background !important; + border-radius: 8px; + height: 45px; + margin: 1px 8px 1px 8px; - &:hover { + &.is-active { + background-color: var(--el-menu-active-color) !important; + color: #fff; + } + &:not(.is-active):hover { + // you can use $sub-menuHover background-color: $base-sub-menu-hover !important; } } & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title, & .theme-dark .el-menu-item { - &:hover { + border-radius: 8px; + height: 45px; + margin: 1px 8px 1px 8px; + + &.is-active { + background-color: var(--el-menu-active-color) !important; + color: #fff; + } + &:not(.is-active):hover { // you can use $sub-menuHover background-color: $base-menu-hover !important; } } + & .nest-menu .el-sub-menu > .el-sub-menu__title, & .el-menu-item { - &:hover { + border-radius: 8px; + height: 45px; + margin: 1px 8px 1px 8px; + + &.is-active { + background-color: var(--el-menu-active-color) !important; + color: #fff; + } + &:not(.is-active):hover { // you can use $sub-menuHover background-color: rgba(0, 0, 0, 0.04) !important; } diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 3aa871b9c721478fed5b87c61bf0c23ad640f84b..8f9c4bd9cc34de7bf82fff4c5eddca2c0159eb75 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,6 +1,6 @@ // 全局SCSS变量 :root { - --menuBg: #304156; + --menuBg: #1f2d3d; --menuColor: #bfcbd9; --menuActiveText: #f4f4f5; --menuHover: #263445; @@ -10,6 +10,11 @@ --subMenuHover: #001528; --subMenuTitleHover: #293444; + // 菜单栏缩进 + --el-menu-base-level-padding: 12px; + --el-menu-level-padding: 8px; + --el-menu-item-height: 50px; + --fixedHeaderBg: #ffffff; --tableHeaderBg: #f8f8f9; --tableHeaderTextColor: #515a6e; diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 92e5f0a6991c5ae44270660d63893f9438d0305d..e9ee67593a9fdc4a66c9cebc8083021e8000b1f1 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -13,7 +13,7 @@ @contextmenu.prevent="openMenu(tag, $event)" > - {{ tag.title }} + {{ tag.title }} @@ -253,7 +253,7 @@ onMounted(() => { position: relative; cursor: pointer; height: 26px; - line-height: 23px; + line-height: 25px; background-color: var(--el-bg-color); border: 1px solid var(--el-border-color-light); color: #495060; @@ -261,6 +261,7 @@ onMounted(() => { font-size: 12px; margin-left: 5px; margin-top: 4px; + border-radius: 4px; &:hover { color: var(--el-color-primary); } @@ -290,6 +291,10 @@ onMounted(() => { .tags-view-item.active.has-icon::before { content: none !important; } + .tags-view-item-title { + margin-left: 4px; + margin-right: 3px; + } .contextmenu { margin: 0; background: var(--el-bg-color);