From abbd3b73f85edb7cda34d36d3fb925e0da046c57 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 5 Jun 2018 13:22:59 +0800 Subject: [PATCH] no message Former-commit-id: 951d7a20ad54bfa63ab573c72ad0d18300bad81f Former-commit-id: 6907ebc0bb4dc59d8cd2d5dd60016f0312e428f8 Former-commit-id: 43c3ae475be2c81c8a2d5552bb96da3e024a6d6c --- src/assets/style/theme/star/index.scss | 32 +++++++++++++------------- src/assets/style/theme/theme.scss | 2 -- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index 9d8ce88f..cb2db71b 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -28,22 +28,19 @@ $theme-container-full-border-color: #d8dfea; } } } - @mixin header-el-menu-item { - background-color: transparent; - background-image: linear-gradient(-180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%); - border-top-color: rgba(0, 0, 0, 0.6); - } // 顶栏菜单 .el-menu { .el-menu-item { transition: border-top-color 0s; color: #FFF; &:hover { - @include header-el-menu-item; + background-color: rgba(#FFF, .3); + } + &:focus { + background-color: rgba(#FFF, .3); } &.is-active { - background-color: transparent; - border-top-color: #FFF; + background-color: rgba(#000, .3); } } .el-submenu { @@ -51,7 +48,10 @@ $theme-container-full-border-color: #d8dfea; transition: border-top-color 0s; color: #FFF; &:hover { - @include header-el-menu-item; + background-color: rgba(#FFF, .3); + } + &:focus { + background-color: rgba(#FFF, .3); } .el-submenu__icon-arrow { color: #FFF; @@ -75,30 +75,30 @@ $theme-container-full-border-color: #d8dfea; .el-container { // 侧边栏 .el-aside { - @mixin aside-el-menu-item { - background-color: transparent; - background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.00) 90%); - } // [菜单] 正常状态 .el-menu { + margin-top: 10px; .el-menu-item { color: #FFF; &:hover { - @include aside-el-menu-item; + background-color: rgba(#FFF, .3); } &:focus { - @include aside-el-menu-item; + background-color: rgba(#FFF, .3); } i { color: #FFF; } + &.is-active { + background-color: rgba(#000, .3); + } } } .el-submenu { .el-submenu__title { color: #FFF; &:hover { - @include aside-el-menu-item; + background-color: rgba(#FFF, .3); } i { color: #FFF; diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index b5fe40b3..1b15f1f9 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -42,12 +42,10 @@ $theme-color: #EFF4F8; background-color: transparent; .el-menu-item { border-bottom: none; - border-top: 2px solid transparent; } .el-submenu { .el-submenu__title { border-bottom: none; - border-top: 2px solid transparent; } } }