diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss index cad7dab9..c135eb15 100644 --- a/src/assets/style/theme/d2/index.scss +++ b/src/assets/style/theme/d2/index.scss @@ -30,22 +30,23 @@ // [组件] d2-container-full .d2-container-full { - border: $theme-container-border; + border: $theme-container-border-outer; border-bottom: none; .d2-container-full__header { - border-bottom: $theme-container-border; + border-bottom: $theme-container-border-inner; } .d2-container-full__footer { - border-top: $theme-container-border; + border-top: $theme-container-border-inner; } } // [组件] d2-container-card .d2-container-card { - border: $theme-container-border; + border: $theme-container-border-outer; .el-card__header { - border-bottom: $theme-container-border; + border-bottom: $theme-container-border-inner; } } + // 顶栏 .el-header { // 切换按钮 diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index e9ce12b8..0d0a2b3c 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -5,7 +5,8 @@ $theme-bg-color: $color-bg; // 主题背景图片 // $theme-bg-image: '/static/image/bg/xxx.jpg'; // container组件的边框 -$theme-container-border: 1px solid $color-border-1; +$theme-container-border-inner: 1px solid $color-border-1; +$theme-container-border-outer: 1px solid $color-border-1; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index e2221d38..cc521169 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -30,20 +30,23 @@ // [组件] d2-container-full .d2-container-full { + border: $theme-container-border-outer; + border-bottom: none; .d2-container-full__header { - border-bottom: $theme-container-border; + border-bottom: $theme-container-border-inner; } .d2-container-full__footer { - border-top: $theme-container-border; + border-top: $theme-container-border-inner; } } // [组件] d2-container-card .d2-container-card { - border: $theme-container-border; + border: $theme-container-border-outer; .el-card__header { - border-bottom: $theme-container-border; + border-bottom: $theme-container-border-inner; } } + // 顶栏 .el-header { // 切换按钮 diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index 11c9cb77..a2a1f59e 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -5,7 +5,8 @@ $theme-bg-color: #EFF4F8; // 主题背景图片 $theme-bg-image: '/static/image/bg/star.jpg'; // container组件的边框 -$theme-container-border: 1px solid #d8dfea; +$theme-container-border-inner: 1px solid #d8dfea; +$theme-container-border-outer: 1px solid #d8dfea; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849;