From e171fbfca5914f16b53e8e50a8e33fc046bbef43 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 12 Jun 2018 00:45:40 +0800 Subject: [PATCH] no message Former-commit-id: eb3c3dd8dfec3bd9a88a114af3db44847f1d8643 Former-commit-id: 541fb1af65045b53a5683f99f1ee88f1f3ababb9 Former-commit-id: 6f819bc1ba1fc2836bf2e663bc2e017561915a09 Former-commit-id: b8b9b3b39bf13a8084237eca938127023b363c6e --- src/assets/style/theme/d2/index.scss | 3 +++ src/assets/style/theme/d2/setting.scss | 2 ++ src/assets/style/theme/line/index.scss | 3 +++ src/assets/style/theme/line/setting.scss | 2 ++ src/assets/style/theme/star/index.scss | 3 +++ src/assets/style/theme/star/setting.scss | 2 ++ src/pages/demo/components/icon/svg.vue | 2 +- 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss index aae39c6a..647b4bc6 100644 --- a/src/assets/style/theme/d2/index.scss +++ b/src/assets/style/theme/d2/index.scss @@ -35,9 +35,11 @@ background-color: $theme-container-background-color; .d2-container-full__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } .d2-container-full__footer { border-top: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } // [组件] d2-container-card @@ -46,6 +48,7 @@ background-color: $theme-container-background-color; .el-card__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index c601388f..14d9f9be 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -4,8 +4,10 @@ $theme-name: 'd2'; $theme-bg-color: $color-bg; // 主题背景图片 // $theme-bg-image: '/static/image/bg/xxx.jpg'; + // container组件 $theme-container-background-color: rgba(#FFF, 1); +$theme-container-header-footer-background-color: rgba(#FFF, .6); $theme-container-border-inner: 1px solid $color-border-2; $theme-container-border-outer: 1px solid $color-border-1; diff --git a/src/assets/style/theme/line/index.scss b/src/assets/style/theme/line/index.scss index fe1cd625..ff807f84 100644 --- a/src/assets/style/theme/line/index.scss +++ b/src/assets/style/theme/line/index.scss @@ -35,9 +35,11 @@ background-color: $theme-container-background-color; .d2-container-full__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } .d2-container-full__footer { border-top: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } // [组件] d2-container-card @@ -46,6 +48,7 @@ background-color: $theme-container-background-color; .el-card__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 76b77832..075996d9 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -4,8 +4,10 @@ $theme-name: 'line'; $theme-bg-color: $color-bg; // 主题背景图片 $theme-bg-image: '/static/image/bg/line-squashed.jpg'; + // container组件 $theme-container-background-color: rgba(#FFF, .8); +$theme-container-header-footer-background-color: rgba(#FFF, .6); $theme-container-border-inner: 1px solid $color-border-2; $theme-container-border-outer: 1px solid $color-border-1; diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index fe1cd625..ff807f84 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -35,9 +35,11 @@ background-color: $theme-container-background-color; .d2-container-full__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } .d2-container-full__footer { border-top: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } // [组件] d2-container-card @@ -46,6 +48,7 @@ background-color: $theme-container-background-color; .el-card__header { border-bottom: $theme-container-border-inner; + background-color: $theme-container-header-footer-background-color; } } diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index 8510f0e9..0c16d9f7 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -4,8 +4,10 @@ $theme-name: 'star'; $theme-bg-color: #EFF4F8; // 主题背景图片 $theme-bg-image: '/static/image/bg/star-squashed.jpg'; + // container组件 $theme-container-background-color: rgba(#FFF, .9); +$theme-container-header-footer-background-color: rgba(#FFF, .6); $theme-container-border-inner: 1px solid #8fb0b1; $theme-container-border-outer: none; diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue index 321741fa..56b51abe 100644 --- a/src/pages/demo/components/icon/svg.vue +++ b/src/pages/demo/components/icon/svg.vue @@ -38,6 +38,6 @@ .icon-title { font-size: 12px; margin-top: 10px; - color: $color-text-placehoder; + color: $color-text-normal; }