From afb7723d00aa58a8f92482bfc2128e1f05aef38b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 28 Jun 2018 15:10:44 +0800 Subject: [PATCH] no message Former-commit-id: 056b7f7a50d64bf320b65ebd3a6301ad6456c914 [formerly 056b7f7a50d64bf320b65ebd3a6301ad6456c914 [formerly 056b7f7a50d64bf320b65ebd3a6301ad6456c914 [formerly 056b7f7a50d64bf320b65ebd3a6301ad6456c914 [formerly ae40bb7b0785f3d8a035922bd37aedbc14d9eb89 [formerly 679045bbef9e94d22587f463269023edcf2c2846]]]]] Former-commit-id: b3f1f954760033eb6f87d85d54da6af30e3d5a31 Former-commit-id: b6675dc93a632741b0910577225a1985a499d039 Former-commit-id: 4fc4f61a0489a545709f6ecce2ad84ff5fcaa818 [formerly 60f3c21bfa08c07170ff4b735823a41588df8de1] Former-commit-id: ce2a206826f4ea40b83c41b296d166cf6e82daed Former-commit-id: e900c8ab833c0e2d69f72de14b947da56aa05c71 Former-commit-id: 15f038af847b48dfb4ddc29fa583bf17fc6f30cf Former-commit-id: 33bbb1a4b0ed13e275e92d4e54c7e7c1b0d2642b Former-commit-id: 5c68f4c25ae0d641fe8cb7679dbdd6a607e95a46 --- src/assets/style/theme/d2/setting.scss | 4 ++-- src/assets/style/theme/line/setting.scss | 4 ++-- src/assets/style/theme/star/setting.scss | 2 +- src/assets/style/theme/theme.scss.REMOVED.git-id | 2 +- src/assets/style/theme/tomorrow-night-blue/setting.scss | 2 +- src/assets/style/theme/violet/setting.scss | 2 +- .../core/d2-container/components/d2-container-full.vue | 2 -- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index b12d73b8..30c49461 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -8,8 +8,8 @@ $theme-bg-mask: rgba(#000, 0); // container组件 $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: rgba(#FFF, .6); -$theme-container-border-inner: 1px solid #cfd7e5; -$theme-container-border-outer: 1px solid #cfd7e5; +$theme-container-border-inner: #cfd7e5; +$theme-container-border-outer: #cfd7e5; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 27b05f94..23f19e17 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -8,8 +8,8 @@ $theme-bg-mask: rgba(#000, 0); // 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; +$theme-container-border-inner: $color-border-2; +$theme-container-border-outer: $color-border-1; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index f25a0a48..ba9cd1c7 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -9,7 +9,7 @@ $theme-bg-mask: rgba(#000, .3); $theme-container-background-color: rgba(#FFF, .9); $theme-container-header-footer-background-color: rgba(#FFF, .6); $theme-container-border-inner: 1px solid #cecece; -$theme-container-border-outer: none; +$theme-container-border-outer: transparent; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id index 8226fcbe..9b8981ae 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -5ce31a7ceba4eae84cb32f4cb53d57de8b8e0ca9 \ No newline at end of file +e538b91929ed1a1d75d379d65878b3944fa51ddb \ No newline at end of file diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss index afe2a8af..c31262a5 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -9,7 +9,7 @@ $theme-bg-mask: rgba(#000, 0); $theme-container-background-color: #FFF; $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid $color-border-1; -$theme-container-border-outer: none; +$theme-container-border-outer: transparent; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss index a060a6f8..2662e1ca 100644 --- a/src/assets/style/theme/violet/setting.scss +++ b/src/assets/style/theme/violet/setting.scss @@ -9,7 +9,7 @@ $theme-bg-mask: rgba(#000, 0); $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 none; +$theme-container-border-outer: transparent; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/core/d2-container/components/d2-container-full.vue index 183c7496..2311589d 100644 --- a/src/components/core/d2-container/components/d2-container-full.vue +++ b/src/components/core/d2-container/components/d2-container-full.vue @@ -26,8 +26,6 @@ export default { right: 20px; bottom: 0px; left: 0px; - // border-top-left-radius: 4px; - // border-top-right-radius: 4px; display: flex; flex-direction: column; overflow: hidden;