diff --git a/src/App.vue b/src/App.vue index 8e4ebff..db21e42 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,3 +14,6 @@ const currentLocale = computed(() => zhCn); + + diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index db1476f..9ab4325 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -39,7 +39,8 @@ nextTick(() => { logo {{ title }} - + @@ -76,7 +77,21 @@ nextTick(() => { :deep(.el-loading-mask) { opacity: 0.45; } - +:deep(.el-menu-item) { + color: #606266!important; +} +:deep(.el-sub-menu.is-active) { + background-color: #e6f7ff!important; +} +:deep(.el-sub-menu__title) { + background: transparent!important; +} +:deep(.el-sub-menu .el-sub-menu__icon-arrow) { + margin-left: 3px!important; +} +:deep(.el-menu--popup .el-menu-item) { + color: #606266 !important; +} /* :deep(.el-sub-menu.is-active .el-sub-menu__title) { border-bottom: 0; } */ diff --git a/src/layout/components/tag/index.scss b/src/layout/components/tag/index.scss index 00699ef..3e25275 100644 --- a/src/layout/components/tag/index.scss +++ b/src/layout/components/tag/index.scss @@ -43,22 +43,23 @@ display: flex; align-items: center; width: 100%; + padding: 4px 0 0 0; font-size: 14px; color: var(--el-text-color-primary); background: #fff; - box-shadow: 0 0 1px #888; + box-shadow: 0 -0.3px 0.5px #888; .scroll-item { position: relative; display: inline-block; height: 38px; padding: 2px 6px; - margin-right: 4px; + margin-right: 16px; line-height: 34px; cursor: pointer; border-color: transparent; border-radius: 6px 6px 0 0; - /* box-shadow: 0 0 1px #888; */ + /* box-shadow: 0 -1px 1px #888; */ transition: all 0.4s; .el-icon-close { @@ -195,7 +196,8 @@ .scroll-item.is-active { position: relative; - background-color: #e6f7ff; + /* background-color: #e6f7ff; */ + background-color: #f0f2f5; border-bottom: none; z-index: 1; @@ -212,13 +214,13 @@ &::before { left: -18px; border-bottom-right-radius: 18px; - box-shadow: 9px 0 0 0 #e6f7ff; + box-shadow: 9px 0 0 0 #f0f2f5; } &::after { right: -18px; border-bottom-left-radius: 18px; - box-shadow: -9px 0 0 0 #e6f7ff; + box-shadow: -9px 0 0 0 #f0f2f5; } &:not(:first-child) { diff --git a/src/layout/theme/index.ts b/src/layout/theme/index.ts index 6180ab6..d03a14f 100644 --- a/src/layout/theme/index.ts +++ b/src/layout/theme/index.ts @@ -23,7 +23,7 @@ const themeColors = { menuHover: "#e0ebf6", subMenuBg: "#fff", subMenuActiveBg: "#e0ebf6", - menuText: "#7a80b4", + menuText: "#606266", sidebarLogo: "#fff", menuTitleHover: "#000", menuActiveBefore: "#4091f7" @@ -67,7 +67,7 @@ const themeColors = { menuHover: "#59bfc1", subMenuBg: "#000", subMenuActiveBg: "#59bfc1", - menuText: "#7a80b4", + menuText: "#606266", sidebarLogo: "#053434", menuTitleHover: "#fff", menuActiveBefore: "#59bfc1" @@ -78,7 +78,7 @@ const themeColors = { menuHover: "#60ac80", subMenuBg: "#000", subMenuActiveBg: "#60ac80", - menuText: "#7a80b4", + menuText: "#606266", sidebarLogo: "#112f21", menuTitleHover: "#fff", menuActiveBefore: "#60ac80" @@ -89,7 +89,7 @@ const themeColors = { menuHover: "#d84493", subMenuBg: "#000", subMenuActiveBg: "#d84493", - menuText: "#7a80b4", + menuText: "#606266", sidebarLogo: "#3f0d29", menuTitleHover: "#fff", menuActiveBefore: "#d84493" @@ -100,7 +100,7 @@ const themeColors = { menuHover: "#693ac9", subMenuBg: "#000", subMenuActiveBg: "#693ac9", - menuText: "#7a80b4", + menuText: "#606266", sidebarLogo: "#1f0c38", menuTitleHover: "#fff", menuActiveBefore: "#693ac9" diff --git a/src/style/sidebar.scss b/src/style/sidebar.scss index e2f7274..873621d 100644 --- a/src/style/sidebar.scss +++ b/src/style/sidebar.scss @@ -1,14 +1,14 @@ /* $sideBarWidth: vertical 模式下主体内容距离网页文档左侧的距离 */ @mixin merge-style($sideBarWidth) { - $menuActiveText: #7a80b4; + $menuActiveText: #606266; - @media screen and (width >= 150px) and (width <= 420px) { + @media screen and (width >=150px) and (width <=420px) { .app-main-nofixed-header { overflow-y: hidden; } } - @media screen and (width >= 420px) { + @media screen and (width >=420px) { .app-main-nofixed-header { overflow: hidden; } @@ -66,7 +66,7 @@ .fixed-header { width: 100% !important; - + .app-main { + +.app-main { padding-top: 37px !important; } } @@ -153,7 +153,7 @@ } } - .is-active > .el-sub-menu__title, + .is-active>.el-sub-menu__title, .is-active.submenu-title-noDropdown { color: $subMenuActiveText !important; @@ -167,7 +167,7 @@ transition: color 0.3s; } - .el-menu-item.is-active.nest-menu > * { + .el-menu-item.is-active.nest-menu>* { z-index: 1; color: #fff; } @@ -190,9 +190,7 @@ } /* 有子集的激活菜单左侧小竖条 */ - .el-menu--collapse - .is-active.outer-most.el-sub-menu - > .el-sub-menu__title::before { + .el-menu--collapse .is-active.outer-most.el-sub-menu>.el-sub-menu__title::before { position: absolute; top: 0; left: 0; @@ -205,7 +203,7 @@ transform: translateY(0); } - .el-menu--collapse .outer-most.el-sub-menu > .el-sub-menu__title::before { + .el-menu--collapse .outer-most.el-sub-menu>.el-sub-menu__title::before { position: absolute; top: 50%; display: block; @@ -216,7 +214,7 @@ } /* 无子集的激活菜单背景 */ - .is-active.submenu-title-noDropdown.outer-most > * { + .is-active.submenu-title-noDropdown.outer-most>* { z-index: 1; color: #fff; } @@ -244,13 +242,13 @@ } } - & > .el-menu { + &>.el-menu { i { margin-right: 20px; } } - .is-active > .el-sub-menu__title, + .is-active>.el-sub-menu__title, .is-active.submenu-title-noDropdown { color: $subMenuActiveText !important; @@ -283,7 +281,7 @@ transition: color 0.3s; } - .el-menu-item.is-active.nest-menu > * { + .el-menu-item.is-active.nest-menu>* { z-index: 1; color: #fff; } @@ -312,7 +310,7 @@ /* horizontal 菜单 */ .el-menu--horizontal { - & > .el-sub-menu .el-sub-menu__icon-arrow { + &>.el-sub-menu .el-sub-menu__icon-arrow { position: static !important; margin-top: 0; } @@ -335,7 +333,7 @@ } /* 无子菜单时激活 border-bottom */ - .router-link-exact-active > .submenu-title-noDropdown { + .router-link-exact-active>.submenu-title-noDropdown { height: 60px; border-bottom: 2px solid var(--el-menu-active-color); } @@ -351,7 +349,7 @@ } } - .is-active > .el-sub-menu__title, + .is-active>.el-sub-menu__title, .is-active.submenu-title-noDropdown { color: $subMenuActiveText !important; @@ -360,7 +358,7 @@ } } - .nest-menu .el-sub-menu > .el-sub-menu__title, + .nest-menu .el-sub-menu>.el-sub-menu__title, .el-menu-item { &:hover { color: $menuTitleHover !important; @@ -372,7 +370,7 @@ transition: color 0.3s; } - .el-menu-item.is-active.nest-menu > * { + .el-menu-item.is-active.nest-menu>* { z-index: 1; color: #fff; } @@ -505,7 +503,7 @@ } } - .is-active > .el-sub-menu__title, + .is-active>.el-sub-menu__title, .is-active.submenu-title-noDropdown { color: $subMenuActiveText !important; @@ -585,8 +583,8 @@ body[layout="vertical"] { /* 菜单折叠 */ .el-menu--collapse { .el-sub-menu { - & > .el-sub-menu__title { - & > span { + &>.el-sub-menu__title { + &>span { width: 100%; height: 100%; text-align: center; @@ -673,10 +671,10 @@ body[layout="mix"] { /* 菜单折叠 */ .el-menu--collapse { .el-sub-menu { - & > .el-sub-menu__title { + &>.el-sub-menu__title { padding: 0; - & > span { + &>span { width: 100%; height: 100%; text-align: center; @@ -686,4 +684,4 @@ body[layout="mix"] { } } } -} +} \ No newline at end of file diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue index 05d4e2b..148bb29 100644 --- a/src/views/welcome/index.vue +++ b/src/views/welcome/index.vue @@ -1,8 +1,171 @@ + + \ No newline at end of file