diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss index 22e45e4..28be9e9 100644 --- a/src/assets/styles/btn.scss +++ b/src/assets/styles/btn.scss @@ -1,4 +1,4 @@ -// @import './variables.module.scss'; +@use './custom-variables.scss' as *; @mixin colorBtn($color) { background: $color; diff --git a/src/assets/styles/variables_custom.scss b/src/assets/styles/custom-variables.scss similarity index 97% rename from src/assets/styles/variables_custom.scss rename to src/assets/styles/custom-variables.scss index 1d8dcbe..34bb128 100644 --- a/src/assets/styles/variables_custom.scss +++ b/src/assets/styles/custom-variables.scss @@ -32,11 +32,11 @@ $base-sub-menu-background: #1f2d3d; $base-sub-menu-hover: #001528; // 组件变量 -$--color-primary: #409EFF; -$--color-success: #67C23A; -$--color-warning: #E6A23C; -$--color-danger: #F56C6C; -$--color-info: #909399; +$color-primary: #409EFF; +$color-success: #67C23A; +$color-warning: #E6A23C; +$color-danger: #F56C6C; +$color-info: #909399; // :export { // menuText: $menuText; diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6157124..3c86dfe 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -1,10 +1,10 @@ -@import './variables.module.scss'; -@import './mixin.scss'; -@import './transition.scss'; -@import './element-ui.scss'; -@import './sidebar.scss'; -@import './btn.scss'; -@import './ruoyi.scss'; +// @use './variables_custom.scss' as *; +@use './mixin.scss'; +@use './transition.scss'; +@use './element-ui.scss'; +@use './sidebar.scss'; +@use './btn.scss'; +@use './ruoyi.scss'; body { height: 100%; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 7758f8b..c27d408 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,3 +1,4 @@ +@use "@/assets/styles/custom-variables.scss" as *; #app { .main-container { diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 954a144..e5c2bf9 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,4 +1,4 @@ -@import './variables_custom.scss'; +@use './custom-variables.scss' as *; :export { menuText: $menuText; @@ -20,9 +20,9 @@ yellow: $yellow; panGreen: $panGreen; // 导出组件颜色 - colorPrimary: $--color-primary; - colorSuccess: $--color-success; - colorWarning: $--color-warning; - colorDanger: $--color-danger; - colorInfo: $--color-info; + colorPrimary: $color-primary; + colorSuccess: $color-success; + colorWarning: $color-warning; + colorDanger: $color-danger; + colorInfo: $color-info; } \ No newline at end of file diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 198983a..9a2d365 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,7 +2,7 @@ * @Author: chris * @Date: 2025-01-13 09:34:10 * @LastEditors: chris - * @LastEditTime: 2025-08-14 11:45:12 + * @LastEditTime: 2025-10-27 16:18:07 -->