ruoyi/RuoYi-Vue3
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi-Vue3.git synced 2025-09-27 23:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

升级组件依赖到最新版本

Browse Source
This commit is contained in:
RuoYi
2025-06-04 15:31:48 +08:00
parent 5723e17eef
commit f237f27861
6 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/styles/btn.scss
View File

@@ -1,4 +1,4 @@
@import './variables.module.scss';
@use './variables.module.scss' as *;
@mixin colorBtn($color) {
background: $color;

13
src/assets/styles/index.scss
View File

@@ -1,10 +1,9 @@
@import './variables.module.scss';
@import './mixin.scss';
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';
@import './btn.scss';
@import './ruoyi.scss';
@use './mixin.scss';
@use './transition.scss';
@use './element-ui.scss';
@use './sidebar.scss';
@use './btn.scss';
@use './ruoyi.scss';
body {
height: 100%;

20
src/assets/styles/sidebar.scss
View File

@@ -1,9 +1,11 @@
@use './variables.module.scss' as vars;
#app {
.main-container {
min-height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
margin-left: vars.$base-sidebar-width;
position: relative;
}
@@ -13,7 +15,7 @@
.sidebar-container {
transition: width 0.28s;
width: $base-sidebar-width !important;
width: vars.$base-sidebar-width !important;
height: 100%;
position: fixed;
font-size: 0px;
@@ -87,12 +89,12 @@
}
& .theme-dark .is-active > .el-sub-menu__title {
color: $base-menu-color-active !important;
color: vars.$base-menu-color-active !important;
}
& .nest-menu .el-sub-menu>.el-sub-menu__title,
& .el-sub-menu .el-menu-item {
min-width: $base-sidebar-width !important;
min-width: vars.$base-sidebar-width !important;
&:hover {
background-color: rgba(0, 0, 0, 0.06) !important;
@@ -101,10 +103,10 @@
& .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;
background-color: vars.$base-sub-menu-background;
&:hover {
background-color: $base-sub-menu-hover !important;
background-color: vars.$base-sub-menu-hover !important;
}
}
}
@@ -167,7 +169,7 @@
}
.el-menu--collapse .el-menu .el-sub-menu {
min-width: $base-sidebar-width !important;
min-width: vars.$base-sidebar-width !important;
}
// mobile responsive
@@ -178,14 +180,14 @@
.sidebar-container {
transition: transform .28s;
width: $base-sidebar-width !important;
width: vars.$base-sidebar-width !important;
}
&.hideSidebar {
.sidebar-container {
pointer-events: none;
transition-duration: 0.3s;
transform: translate3d(-$base-sidebar-width, 0, 0);
transform: translate3d(-(vars.$base-sidebar-width), 0, 0);
}
}
}

2
src/layout/components/Sidebar/Logo.vue
View File

@@ -47,8 +47,6 @@ const getLogoTextColor = computed(() => {
</script>
<style lang="scss" scoped>
@import '@/assets/styles/variables.module.scss';
.sidebarLogoFade-enter-active {
transition: opacity 1.5s;
}

8
src/layout/index.vue
View File

@@ -64,11 +64,11 @@ function setLayout() {
</script>
<style lang="scss" scoped>
@import "@/assets/styles/mixin.scss";
@import "@/assets/styles/variables.module.scss";
@use "@/assets/styles/mixin.scss" as mix;
@use "@/assets/styles/variables.module.scss" as vars;
.app-wrapper {
@include clearfix;
@include mix.clearfix;
position: relative;
height: 100%;
width: 100%;
@@ -94,7 +94,7 @@ function setLayout() {
top: 0;
right: 0;
z-index: 9;
width: calc(100% - #{$base-sidebar-width});
width: calc(100% - #{vars.$base-sidebar-width});
transition: width 0.28s;
}