From fc1b729294192716d2b52f00479cb06c9311b4b9 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 11 Jun 2018 10:56:34 +0800 Subject: [PATCH] no message Former-commit-id: f9b75cdafb5fad0b179a6c0f08cb879a7fd12dd3 Former-commit-id: 3b126bcb4f5547a63cb75fe9f0a25c3b41fc56e6 Former-commit-id: 5c161fbfdac589557a05f84585ea3def43480bce --- src/assets/style/theme/star/index.scss | 7 +++++-- .../components/-header-right/components/-full-screen.vue | 2 +- .../components/-header-right/components/-theme.vue | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index 7b8f0b89..9ab30d61 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -30,6 +30,7 @@ $theme-aside-item-background-color-focus: rgba(#FFF, .3); $theme-aside-item-background-color-active: rgba(#000, .3); .theme-#{$theme-name} { + .layout-main { background-color: $theme-bg-color; background-image: url($theme-bg-image); @@ -116,8 +117,10 @@ $theme-aside-item-background-color-active: rgba(#000, .3); .d2-header-right { .btn-text { color: $theme-header-text-color; - &:hover { - background-color: $theme-header-item-background-color-hover; + &.can-hover { + &:hover { + background-color: $theme-header-item-background-color-hover; + } } } } diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue b/src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue index 587073e1..7f877d71 100644 --- a/src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue +++ b/src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue @@ -3,7 +3,7 @@ effect="dark" :content="isFullScreen ? '退出全屏' : '全屏'" placement="bottom"> - + diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue b/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue index d7802460..fb5e9ec7 100644 --- a/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue +++ b/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue @@ -1,7 +1,7 @@