From 49f62e565ab959c5a01c6ecb1e3b16a29ab1fe9d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 16 Dec 2025 11:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AF=BC=E8=88=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=94=AF=E6=8C=81=E7=BA=AF=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/assets/styles/ruoyi.scss | 12 + ruoyi-ui/src/assets/styles/sidebar.scss | 2 +- ruoyi-ui/src/components/Breadcrumb/index.vue | 1 - ruoyi-ui/src/components/TopNav/index.vue | 6 +- ruoyi-ui/src/layout/components/Navbar.vue | 54 +++- .../src/layout/components/Settings/index.vue | 239 ++++++++++++------ .../src/layout/components/Sidebar/Logo.vue | 10 +- .../src/layout/components/TopBar/index.vue | 108 ++++++++ ruoyi-ui/src/settings.js | 4 +- ruoyi-ui/src/store/modules/settings.js | 4 +- 10 files changed, 344 insertions(+), 96 deletions(-) create mode 100644 ruoyi-ui/src/layout/components/TopBar/index.vue diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index ab4a1d2d6b..a5e0b34540 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -130,6 +130,18 @@ border-radius: 4px; } +/* el menu */ +.el-menu-item, +.el-sub-menu { + .svg-icon + span { + margin-left: 5px; + } +} + +.el-menu--horizontal .el-menu--popup { + min-width: 120px !important; +} + @media (max-width: 768px) { .pagination-container .el-pagination > .el-pagination__jump { display: none !important; diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss index f1c821f155..1abf194116 100644 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ b/ruoyi-ui/src/assets/styles/sidebar.scss @@ -61,7 +61,7 @@ } .svg-icon { - margin-right: 16px; + margin-right: 10px !important; } .el-menu { diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/ruoyi-ui/src/components/Breadcrumb/index.vue index 080595a4ec..84f4831af7 100644 --- a/ruoyi-ui/src/components/Breadcrumb/index.vue +++ b/ruoyi-ui/src/components/Breadcrumb/index.vue @@ -94,7 +94,6 @@ export default { display: inline-block; font-size: 14px; line-height: 50px; - margin-left: 8px; .no-redirect { color: #97a8be; cursor: text; diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index b3f3331452..8e742c5d4d 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -162,7 +162,7 @@ export default { this.$store.dispatch('app/toggleSideBarHide', true) } } - }, + } } @@ -171,7 +171,7 @@ export default { float: left; height: 50px !important; line-height: 50px !important; - color: #999093 !important; + color: #303133 !important; padding: 0 5px !important; margin: 0 10px !important; } @@ -186,7 +186,7 @@ export default { float: left; height: 50px !important; line-height: 50px !important; - color: #999093 !important; + color: #303133 !important; padding: 0 5px !important; margin: 0 10px !important; } diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 1d10b91a0f..f64e554f7f 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,10 +1,13 @@