From 642a57fce88072837146242771b7601135fa98ed Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 30 Jun 2018 23:17:06 +0800 Subject: [PATCH] no message Former-commit-id: d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly d6e75a334d8531d759e7f94f2e836c041e7550da [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad] [formerly 09d71e69c860aa07b650248c83cc2ae697e9baad [formerly 4c11071f915c4f0116a46261b3dd770091972017 [formerly fcef7f9f40c200fe087bbe2b1d50d9990c9c2ee7]]]]] Former-commit-id: 4cd0eed73bde345a69ae32bb429a9d0500185077 Former-commit-id: 0d242ffc8e8f781b00fda2c094949bd086ac9bb9 Former-commit-id: b033616bf69e58ab05fdccada41413976b34e35c [formerly b8a194d17dc99b589141b416122396929cff86b9] Former-commit-id: 73a9f7165240ad39189f1c00dcdc596fd38872ef Former-commit-id: f2d09e628c50423bd00729df777918004c872879 Former-commit-id: 1adb7b002e38ca0d2ce70310e39f2b95ac620525 Former-commit-id: f92f60c2b8b8196833686ddaabbf5a3b44ae8a64 Former-commit-id: aa20183d040bd2f6e5920906f79a223433fba929 --- src/assets/style/theme/theme-base.scss | 2 +- src/assets/style/theme/theme.scss | 2 +- src/components/core/d2-layout-main/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss index d9b4ea7d..95ec8d2c 100644 --- a/src/assets/style/theme/theme-base.scss +++ b/src/assets/style/theme/theme-base.scss @@ -56,7 +56,7 @@ } } // [菜单] 顶栏 - .el-menu.d2-theme-header-menu { + .el-menu { float: left; border-bottom: none; background-color: transparent; diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index 59dcad55..6ebf382f 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -51,7 +51,7 @@ } } // 顶栏菜单 - .el-menu.d2-theme-header-menu { + .el-menu { .el-menu-item { transition: border-top-color 0s; color: $theme-header-item-color; diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue index c3989dba..3a7015de 100644 --- a/src/components/core/d2-layout-main/index.vue +++ b/src/components/core/d2-layout-main/index.vue @@ -16,7 +16,7 @@
- +