From cced216ec5c1b89281ac128aee19c80e9be875c3 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 28 Jun 2018 15:23:42 +0800 Subject: [PATCH] no message Former-commit-id: 713900a280ada9d2fa3c4d8e0867f81063d56dee [formerly 713900a280ada9d2fa3c4d8e0867f81063d56dee [formerly 713900a280ada9d2fa3c4d8e0867f81063d56dee [formerly 713900a280ada9d2fa3c4d8e0867f81063d56dee [formerly cede19252333f91ca9d344e5e1c2df4f32f4303d [formerly 5dc4a7965da71a1289ef649ddb77dadd3cf80e2d]]]]] Former-commit-id: c9b685a52bc23fdc5dc29970483718e7aec5a64c Former-commit-id: ae070ab11cda3313290e919aa2e6164b6df2f7ef Former-commit-id: 16ff34c417daf44835ec8c4d8aeaca2408de209f [formerly 612bac775c7863f471bb1f285eb5d2efbc6a600b] Former-commit-id: 1cddbc22a8e3c9be3584251fb42c1b716d71c59f Former-commit-id: 6968f43e94acdafaf09d128760cddb2691d9c249 Former-commit-id: 454538283fe058b37e3105ad77b6210c86ec1533 Former-commit-id: 8b324a5a0df3e58dacc26ed58826bba9122406fa Former-commit-id: 69de57771105f1c0d3250ed2c8d16f5a34be794b --- 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 | 4 ++-- src/assets/style/theme/violet/setting.scss | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index 30c49461..b12d73b8 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: #cfd7e5; -$theme-container-border-outer: #cfd7e5; +$theme-container-border-inner: 1px solid #cfd7e5; +$theme-container-border-outer: 1px solid #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 23f19e17..27b05f94 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: $color-border-2; -$theme-container-border-outer: $color-border-1; +$theme-container-border-inner: 1px solid $color-border-2; +$theme-container-border-outer: 1px solid $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 ba9cd1c7..0745e12f 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: transparent; +$theme-container-border-outer: 1px solid #EFF4F8; // 顶栏和侧边栏中展开的菜单 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 9b8981ae..7e4ee03d 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -e538b91929ed1a1d75d379d65878b3944fa51ddb \ No newline at end of file +0a9f6048920f43eb8f67242fa38640eeb30018b1 \ 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 c31262a5..0864448c 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -8,8 +8,8 @@ $theme-bg-mask: rgba(#000, 0); // container组件 $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: transparent; +$theme-container-border-inner: 1px solid #002253; +$theme-container-border-outer: 1px solid #002253; // 顶栏和侧边栏中展开的菜单 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 2662e1ca..4b7c587c 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: transparent; +$theme-container-border-outer: none; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849;