diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/assets/images/next_level_active.png b/src/assets/images/next_level_active.png new file mode 100644 index 0000000..1a52ae8 --- /dev/null +++ b/src/assets/images/next_level_active.png Binary files differ diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/assets/images/next_level_active.png b/src/assets/images/next_level_active.png new file mode 100644 index 0000000..1a52ae8 --- /dev/null +++ b/src/assets/images/next_level_active.png Binary files differ diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 3b53223..6dc95ed 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -7,6 +7,10 @@ $table:( "header-bg-color":#f2f6ff, "header-text-color":#444c59 + ), + $menu:( + "base-level-padding": 15px, + "level-padding": 10px ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/assets/images/next_level_active.png b/src/assets/images/next_level_active.png new file mode 100644 index 0000000..1a52ae8 --- /dev/null +++ b/src/assets/images/next_level_active.png Binary files differ diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 3b53223..6dc95ed 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -7,6 +7,10 @@ $table:( "header-bg-color":#f2f6ff, "header-text-color":#444c59 + ), + $menu:( + "base-level-padding": 15px, + "level-padding": 10px ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index 4565a0f..938efd4 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -6,7 +6,7 @@ // 头部宽度(默认自适应宽度,可固定宽度,固定宽度后为居中显示) --g-header-width: 100%; // 头部高度 - --g-header-height: 67px; + --g-header-height: 60px; // 侧边栏宽度 --g-main-sidebar-width: 70px; --g-sub-sidebar-width: 180px; @@ -91,3 +91,20 @@ .el-cascader.full-width-input { width: 100% !important; } + +.el-menu--popup { + color: var(--g-sub-sidebar-popmenu-bg); + + .sidebar-item { + .el-menu-item, + .el-sub-menu__title { + color: var(--g-sub-sidebar-popmenu-color) !important; + } + + .el-menu-item:hover, + .el-sub-menu__title:hover { + color: var(--g-sub-sidebar-popmenu-active-color) !important; + background-color: var(--g-sub-sidebar-popmenu-hover-color) !important; + } + } +} diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/assets/images/next_level_active.png b/src/assets/images/next_level_active.png new file mode 100644 index 0000000..1a52ae8 --- /dev/null +++ b/src/assets/images/next_level_active.png Binary files differ diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 3b53223..6dc95ed 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -7,6 +7,10 @@ $table:( "header-bg-color":#f2f6ff, "header-text-color":#444c59 + ), + $menu:( + "base-level-padding": 15px, + "level-padding": 10px ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index 4565a0f..938efd4 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -6,7 +6,7 @@ // 头部宽度(默认自适应宽度,可固定宽度,固定宽度后为居中显示) --g-header-width: 100%; // 头部高度 - --g-header-height: 67px; + --g-header-height: 60px; // 侧边栏宽度 --g-main-sidebar-width: 70px; --g-sub-sidebar-width: 180px; @@ -91,3 +91,20 @@ .el-cascader.full-width-input { width: 100% !important; } + +.el-menu--popup { + color: var(--g-sub-sidebar-popmenu-bg); + + .sidebar-item { + .el-menu-item, + .el-sub-menu__title { + color: var(--g-sub-sidebar-popmenu-color) !important; + } + + .el-menu-item:hover, + .el-sub-menu__title:hover { + color: var(--g-sub-sidebar-popmenu-active-color) !important; + background-color: var(--g-sub-sidebar-popmenu-hover-color) !important; + } + } +} diff --git a/src/assets/styles/themes.scss b/src/assets/styles/themes.scss index 47da1fb..418dc62 100644 --- a/src/assets/styles/themes.scss +++ b/src/assets/styles/themes.scss @@ -52,6 +52,14 @@ --g-sub-sidebar-menu-active-color: #3d7eff; // 菜单选中背景色 --g-sub-sidebar-menu-active-bg: #dae9fe; + // 弹出菜单背景色 + --g-sub-sidebar-popmenu-bg: #fff; + // 弹出菜单文字颜色 + --g-sub-sidebar-popmenu-color: rgb(92 92 92); + // 弹出菜单鼠标悬浮文字颜色 + --g-sub-sidebar-popmenu-hover-color: #dae9fe; + // 弹出菜单选中文字颜色 + --g-sub-sidebar-popmenu-active-color: rgb(92 92 92); /* ----- 顶栏 ----- */ --g-toolbar-bg: var(--el-bg-color); diff --git a/src/App.vue b/src/App.vue index 8624b4c..52ccd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ actualWidth = 0 } else if (settingsStore.menu.subMenuCollapse) { - actualWidth = 64 + actualWidth = 55 } return `${actualWidth}px` }) diff --git a/src/assets/icons/icon-setting.svg b/src/assets/icons/icon-setting.svg new file mode 100644 index 0000000..33353f0 --- /dev/null +++ b/src/assets/icons/icon-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/next_level.png b/src/assets/images/next_level.png new file mode 100644 index 0000000..53d2837 --- /dev/null +++ b/src/assets/images/next_level.png Binary files differ diff --git a/src/assets/images/next_level_active.png b/src/assets/images/next_level_active.png new file mode 100644 index 0000000..1a52ae8 --- /dev/null +++ b/src/assets/images/next_level_active.png Binary files differ diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 3b53223..6dc95ed 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -7,6 +7,10 @@ $table:( "header-bg-color":#f2f6ff, "header-text-color":#444c59 + ), + $menu:( + "base-level-padding": 15px, + "level-padding": 10px ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index 4565a0f..938efd4 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -6,7 +6,7 @@ // 头部宽度(默认自适应宽度,可固定宽度,固定宽度后为居中显示) --g-header-width: 100%; // 头部高度 - --g-header-height: 67px; + --g-header-height: 60px; // 侧边栏宽度 --g-main-sidebar-width: 70px; --g-sub-sidebar-width: 180px; @@ -91,3 +91,20 @@ .el-cascader.full-width-input { width: 100% !important; } + +.el-menu--popup { + color: var(--g-sub-sidebar-popmenu-bg); + + .sidebar-item { + .el-menu-item, + .el-sub-menu__title { + color: var(--g-sub-sidebar-popmenu-color) !important; + } + + .el-menu-item:hover, + .el-sub-menu__title:hover { + color: var(--g-sub-sidebar-popmenu-active-color) !important; + background-color: var(--g-sub-sidebar-popmenu-hover-color) !important; + } + } +} diff --git a/src/assets/styles/themes.scss b/src/assets/styles/themes.scss index 47da1fb..418dc62 100644 --- a/src/assets/styles/themes.scss +++ b/src/assets/styles/themes.scss @@ -52,6 +52,14 @@ --g-sub-sidebar-menu-active-color: #3d7eff; // 菜单选中背景色 --g-sub-sidebar-menu-active-bg: #dae9fe; + // 弹出菜单背景色 + --g-sub-sidebar-popmenu-bg: #fff; + // 弹出菜单文字颜色 + --g-sub-sidebar-popmenu-color: rgb(92 92 92); + // 弹出菜单鼠标悬浮文字颜色 + --g-sub-sidebar-popmenu-hover-color: #dae9fe; + // 弹出菜单选中文字颜色 + --g-sub-sidebar-popmenu-active-color: rgb(92 92 92); /* ----- 顶栏 ----- */ --g-toolbar-bg: var(--el-bg-color); diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue index 4a98f23..83ad8cd 100644 --- a/src/layouts/components/Header/index.vue +++ b/src/layouts/components/Header/index.vue @@ -31,7 +31,7 @@