From d6471b50f1edbf564243f65ea5a2ae4af94f77f3 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 27 Jun 2018 08:39:32 +0800 Subject: [PATCH] no message Former-commit-id: a786e8d1fad254639809f83265869d70c6935788 [formerly a786e8d1fad254639809f83265869d70c6935788 [formerly a786e8d1fad254639809f83265869d70c6935788 [formerly a786e8d1fad254639809f83265869d70c6935788 [formerly ba8023f62f09cd4a55c6ee166e55e9aa908107d4 [formerly 93211b0e6b1aea5bc628a245f339282029e41a43]]]]] Former-commit-id: 202b9b999ae1fcd6116d1872f33aa2cffcdbaa42 Former-commit-id: 449f05894a74a6414e0eecc09d4b5843de10b203 Former-commit-id: f52906ee2cdbff9dd7f8c48314502e2ca475bfad [formerly 9f1f64ff56bfa42b07cc509635249bd17f483a49] Former-commit-id: eff0b45b0ddc9ba88b715cee8f63d1edd364e6b1 Former-commit-id: a5ce2863d653c610e3139a73c28a5c593716f7a2 Former-commit-id: 189f999742f306155c8e197286b245f177865be8 Former-commit-id: 42160d53c4cbcf99d185c68ec3ce1fefcaf30622 Former-commit-id: cc99cd8ac7742e334a5219971e7817426123c2df --- design.sketch.REMOVED.git-id | 2 +- src/assets/style/theme/theme.scss | 30 +++++++++++----------- src/assets/style/theme/violet/setting.scss | 12 ++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id index 0e90a310..03e570f9 100644 --- a/design.sketch.REMOVED.git-id +++ b/design.sketch.REMOVED.git-id @@ -1 +1 @@ -f94fe38d32ef5996c3c5f04f05c48f1a90899ae8 \ No newline at end of file +36b6c3318dcc605e71ed13639faa5a8a58a81013 \ No newline at end of file diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index 93dc1ac5..38288756 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -215,7 +215,7 @@ .toggle-aside-btn { i { color: $theme-header-item-color; - background-color: $theme-header-item-background-color; + background: $theme-header-item-background-color; &:hover { color: $theme-header-item-color-hover; } @@ -226,38 +226,38 @@ .el-menu-item { transition: border-top-color 0s; color: $theme-header-item-color; - background-color: $theme-header-item-background-color; + background: $theme-header-item-background-color; &:hover { color: $theme-header-item-color-hover; - background-color: $theme-header-item-background-color-hover; + background: $theme-header-item-background-color-hover; } &:focus { color: $theme-header-item-color-focus; - background-color: $theme-header-item-background-color-focus; + background: $theme-header-item-background-color-focus; } &.is-active { color: $theme-header-item-color-active; - background-color: $theme-header-item-background-color-active; + background: $theme-header-item-background-color-active; } } .el-submenu { .el-submenu__title { transition: border-top-color 0s; color: $theme-header-item-color; - background-color: $theme-header-item-background-color; + background: $theme-header-item-background-color; .el-submenu__icon-arrow { color: $theme-header-item-color; } &:hover { color: $theme-header-item-color-hover; - background-color: $theme-header-item-background-color-hover; + background: $theme-header-item-background-color-hover; .el-submenu__icon-arrow { color: $theme-header-item-color-hover; } } &:focus { color: $theme-header-item-color-focus; - background-color: $theme-header-item-background-color-focus; + background: $theme-header-item-background-color-focus; .el-submenu__icon-arrow { color: $theme-header-item-color-focus; } @@ -272,7 +272,7 @@ &.can-hover { &:hover { color: $theme-header-item-color-hover; - background-color: $theme-header-item-background-color-hover; + background: $theme-header-item-background-color-hover; } } } @@ -305,27 +305,27 @@ .el-menu { .el-menu-item { color: $theme-aside-item-color; - background-color: $theme-aside-item-background-color; + background: $theme-aside-item-background-color; i { color: $theme-aside-item-color; } &:hover { color: $theme-aside-item-color-hover; - background-color: $theme-aside-item-background-color-hover; + background: $theme-aside-item-background-color-hover; i { color: $theme-aside-item-color-hover; } } &:focus { color: $theme-aside-item-color-focus; - background-color: $theme-aside-item-background-color-focus; + background: $theme-aside-item-background-color-focus; i { color: $theme-aside-item-color-focus; } } &.is-active { color: $theme-aside-item-color-active; - background-color: $theme-aside-item-background-color-active; + background: $theme-aside-item-background-color-active; i { color: $theme-aside-item-color-active; } @@ -335,7 +335,7 @@ .el-submenu { .el-submenu__title { color: $theme-aside-item-color; - background-color: $theme-aside-item-background-color; + background: $theme-aside-item-background-color; i { color: $theme-aside-item-color; } @@ -344,7 +344,7 @@ } &:hover { color: $theme-aside-item-color-hover; - background-color: $theme-aside-item-background-color-hover; + background: $theme-aside-item-background-color-hover; i { color: $theme-aside-item-color-hover; } diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss index 75b9d0bd..51851c96 100644 --- a/src/assets/style/theme/violet/setting.scss +++ b/src/assets/style/theme/violet/setting.scss @@ -20,26 +20,26 @@ $theme-header-item-color: #FFF; $theme-header-item-background-color: transparent; // 顶栏上的项目在 hover 时 $theme-header-item-color-hover: #FFF; -$theme-header-item-background-color-hover: rgba(#FFF, .1); +$theme-header-item-background-color-hover: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%); // 顶栏上的项目在 focus 时 $theme-header-item-color-focus: #FFF; -$theme-header-item-background-color-focus: rgba(#000, .02); +$theme-header-item-background-color-focus: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%); // 顶栏上的项目在 active 时 $theme-header-item-color-active: #FFF; -$theme-header-item-background-color-active: rgba(#000, .1); +$theme-header-item-background-color-active: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%); // 侧边栏上的文字颜色 $theme-aside-item-color: #FFF; $theme-aside-item-background-color: transparent; // 侧边栏上的项目在 hover 时 $theme-aside-item-color-hover: #FFF; -$theme-aside-item-background-color-hover: rgba(#000, .02); +$theme-aside-item-background-color-hover: linear-gradient(90deg, rgba(255,255,255,0.28) 0%, rgba(255,255,255,0.00) 100%); // 侧边栏上的项目在 focus 时 $theme-aside-item-color-focus: #FFF; -$theme-aside-item-background-color-focus: rgba(#000, .02); +$theme-aside-item-background-color-focus: linear-gradient(90deg, rgba(255,255,255,0.28) 0%, rgba(255,255,255,0.00) 100%); // 侧边栏上的项目在 active 时 $theme-aside-item-color-active: #FFF; -$theme-aside-item-background-color-active: rgba(#000, .1); +$theme-aside-item-background-color-active: linear-gradient(90deg, rgba(255,255,255,0.28) 0%, rgba(255,255,255,0.00) 100%); // 侧边栏菜单为空的时候显示的元素 $theme-aside-menu-empty-icon-color: #FFF;