From ccdfe68a7921c9276ee26ca2c3d078965ca40e58 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 5 Jun 2018 13:00:17 +0800 Subject: [PATCH] no message Former-commit-id: 7550205a6806f9eece74e85e246a5cc4b83e1c24 Former-commit-id: 6a36eaaa942e230de2be6e0ef8a680d2cfcdfcad Former-commit-id: 8979525f2b4687b3627bd897263dc97c9904e0c2 --- src/assets/style/theme/star/index.scss | 3 --- .../components/D2MenuItem.vue => D2MenuItem/index.vue} | 0 .../components/D2Submenu.vue => D2Submenu/index.vue} | 2 +- .../core/MainLayout/components/HeaderMenu/index.vue | 1 + .../core/MainLayout/components/HeaderRight/index.vue | 1 + src/components/core/MainLayout/components/SideMenu/index.vue | 4 ++-- 6 files changed, 5 insertions(+), 6 deletions(-) rename src/components/core/MainLayout/components/{SideMenu/components/D2MenuItem.vue => D2MenuItem/index.vue} (100%) rename src/components/core/MainLayout/components/{SideMenu/components/D2Submenu.vue => D2Submenu/index.vue} (91%) diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index 756593c8..9d8ce88f 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -100,9 +100,6 @@ $theme-container-full-border-color: #d8dfea; &:hover { @include aside-el-menu-item; } - &:focus { - @include aside-el-menu-item; - } i { color: #FFF; } diff --git a/src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue b/src/components/core/MainLayout/components/D2MenuItem/index.vue similarity index 100% rename from src/components/core/MainLayout/components/SideMenu/components/D2MenuItem.vue rename to src/components/core/MainLayout/components/D2MenuItem/index.vue diff --git a/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue b/src/components/core/MainLayout/components/D2Submenu/index.vue similarity index 91% rename from src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue rename to src/components/core/MainLayout/components/D2Submenu/index.vue index 15f17561..950b331d 100644 --- a/src/components/core/MainLayout/components/SideMenu/components/D2Submenu.vue +++ b/src/components/core/MainLayout/components/D2Submenu/index.vue @@ -22,7 +22,7 @@ export default { } }, components: { - D2MenuItem: () => import('./D2MenuItem.vue') + D2MenuItem: () => import('../D2MenuItem/index.vue') } } diff --git a/src/components/core/MainLayout/components/HeaderMenu/index.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue index d0994adc..7352999c 100644 --- a/src/components/core/MainLayout/components/HeaderMenu/index.vue +++ b/src/components/core/MainLayout/components/HeaderMenu/index.vue @@ -25,6 +25,7 @@