diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index a5e0b34540..e1ba08258f 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -130,12 +130,10 @@ border-radius: 4px; } -/* el menu */ -.el-menu-item, -.el-sub-menu { - .svg-icon + span { - margin-left: 5px; - } +/* horizontal el menu */ +.el-menu--horizontal .el-menu-item .svg-icon + span, +.el-menu--horizontal .el-submenu__title .svg-icon + span { + margin-left: 3px; } .el-menu--horizontal .el-menu--popup { diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss index 1abf194116..3e0655ee72 100644 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ b/ruoyi-ui/src/assets/styles/sidebar.scss @@ -116,18 +116,20 @@ margin-left: 54px; } - .submenu-title-noDropdown { - padding: 0 !important; - position: relative; - - .el-tooltip { + .el-menu:not(.el-menu--horizontal) { + .submenu-title-noDropdown { padding: 0 !important; + position: relative; - .svg-icon { - margin-left: 20px; + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } } } - } + } .el-submenu { overflow: hidden; diff --git a/ruoyi-ui/src/layout/components/TopBar/index.vue b/ruoyi-ui/src/layout/components/TopBar/index.vue index 896a172ca0..698419b661 100644 --- a/ruoyi-ui/src/layout/components/TopBar/index.vue +++ b/ruoyi-ui/src/layout/components/TopBar/index.vue @@ -60,36 +60,22 @@ export default { +