From 882411293badf45bab953e5d0041f2242fc5077f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 15 Jun 2018 22:49:03 +0800 Subject: [PATCH] no message Former-commit-id: 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0 [formerly 4883743b90443196942de10c1c9bf3c8dd50d5e8 [formerly 6d1f870637fa1e2b0e37389893b0c1b9f424ef3a]]]]] Former-commit-id: d0349d72df65db504a5d91e27b9b924f1d93bb09 Former-commit-id: 33cab27531ad14cd435418e9db30840f278b9435 Former-commit-id: 700c39ffcd7fc1edc0dd8faa515cdf765e685069 [formerly 395d83db93d411e9b985cbabbb943b8b12751631] Former-commit-id: 2a4e5491304fb94e68d8bb650cc38485bfe80eb3 Former-commit-id: acccf1da2e86a4f96b32034a86ca90a7d6a0d68f Former-commit-id: e0a8b6b17c40b2d24d877e7ccb9cd678f578c068 Former-commit-id: cba434c6926224844e3e5497db251b3cf0a3f0ed Former-commit-id: 994c026387cda23614ec017c0eb9292ee78b2c94 --- src/assets/style/theme/d2/setting.scss | 2 ++ src/assets/style/theme/line/setting.scss | 2 ++ src/assets/style/theme/star/setting.scss | 2 ++ src/assets/style/theme/theme.scss | 4 +++- src/assets/style/theme/tomorrow-night-blue/setting.scss | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index 92b1718a..e9cc35e4 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -4,6 +4,8 @@ $theme-name: 'd2'; $theme-bg-color: #f8f8f9; // 主题背景图片 $theme-bg-image: none; +// 主题背景图片遮罩 +$theme-bg-mask: rgba(#000, 0); // container组件 $theme-container-background-color: rgba(#FFF, 1); diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 26cfec94..e995f543 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -4,6 +4,8 @@ $theme-name: 'line'; $theme-bg-color: #f8f8f9; // 主题背景图片 $theme-bg-image: url('/static/image/bg/line-squashed.jpg'); +// 主题背景图片遮罩 +$theme-bg-mask: rgba(#000, 0); // container组件 $theme-container-background-color: rgba(#FFF, .8); diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index ece6c2c0..b2f69439 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -4,6 +4,8 @@ $theme-name: 'star'; $theme-bg-color: #EFF4F8; // 主题背景图片 $theme-bg-image: url('/static/image/bg/star-squashed.jpg'); +// 主题背景图片遮罩 +$theme-bg-mask: rgba(#000, .3); // container组件 $theme-container-background-color: rgba(#FFF, .9); diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index a9087e33..28255142 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -12,7 +12,6 @@ right: 0px; bottom: 0px; left: 0px; - background-color: rgba(#000, .3); } // 主体 .layout-main { @@ -188,6 +187,9 @@ .layout-main-group { background-color: $theme-bg-color; background-image: $theme-bg-image; + .layout-main-mask { + background-color: $theme-bg-mask; + } } // 菜单项目 @mixin theme-menu-hover-style { diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss index de55406a..a3381ecf 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -4,6 +4,8 @@ $theme-name: 'tomorrow-night-blue'; $theme-bg-color: #002147; // 主题背景图片 $theme-bg-image: none; +// 主题背景图片遮罩 +$theme-bg-mask: rgba(#000, 0); // container组件 $theme-container-background-color: #FFF;