diff --git a/vue/src/assets/styles/sidebar.scss b/vue/src/assets/styles/sidebar.scss index be77b4e..8631472 100644 --- a/vue/src/assets/styles/sidebar.scss +++ b/vue/src/assets/styles/sidebar.scss @@ -1,3 +1,5 @@ +$iconSize: 17px; + .sidebar-container { display: flex; flex-direction: column; @@ -10,7 +12,7 @@ //折叠设置 &.collapse-sidebar { - width: 54px; + width: $iconSize + 20px * 2; .sidebar-item-content { display: none; @@ -72,24 +74,8 @@ } } - a { - display: inline-block; - width: 100%; - overflow: hidden; - } - - .svg-icon { - margin-right: 16px; - } - - .el-menu { - border: none; - height: 100%; - width: 100%; - } - .is-active > .el-submenu__title { - color: #fff !important; + color: $--color-primary !important; } // menu hover @@ -110,15 +96,22 @@ } } -.el-menu--vertical { +.el-menu { + border: none; + height: 100%; + width: 100%; + .svg-icon { margin-right: 16px; + width: $iconSize; + height: $iconSize; } - //侧边菜单折叠时弹出菜单的滚动条高度 - /*.popover-menu__wrap { - max-height: 80vh; - }*/ + a { + display: inline-block; + width: 100%; + overflow: hidden; + } .popover-menu__title { cursor: auto; diff --git a/vue/src/components/OrgTree/index.vue b/vue/src/components/OrgTree/index.vue index d3d768f..481189a 100644 --- a/vue/src/components/OrgTree/index.vue +++ b/vue/src/components/OrgTree/index.vue @@ -177,6 +177,4 @@ } - + diff --git a/vue/src/components/Skeleton/index.vue b/vue/src/components/Skeleton/index.vue index 4316696..f0ba183 100644 --- a/vue/src/components/Skeleton/index.vue +++ b/vue/src/components/Skeleton/index.vue @@ -44,6 +44,4 @@ } - + diff --git a/vue/src/components/SvgIcon/index.vue b/vue/src/components/SvgIcon/index.vue index 5f93400..9ccaa2f 100644 --- a/vue/src/components/SvgIcon/index.vue +++ b/vue/src/components/SvgIcon/index.vue @@ -1,6 +1,6 @@ - - @@ -41,7 +41,6 @@ .svg-icon { width: 1em; height: 1em; - vertical-align: -0.15em; fill: currentColor; overflow: hidden; } diff --git a/vue/src/views/app/register.vue b/vue/src/views/app/register.vue index ab4fb51..8372790 100644 --- a/vue/src/views/app/register.vue +++ b/vue/src/views/app/register.vue @@ -109,5 +109,5 @@ diff --git a/vue/src/views/index/components/PanelGroup/PanelGroupItem.vue b/vue/src/views/index/components/PanelGroup/PanelGroupItem.vue index e9b2915..a1aeab7 100644 --- a/vue/src/views/index/components/PanelGroup/PanelGroupItem.vue +++ b/vue/src/views/index/components/PanelGroup/PanelGroupItem.vue @@ -3,8 +3,8 @@ class="card-panel" type="flex" justify="space-between" - @mouseout.native="style='color:'+color" - @mouseover.native="style='background:'+color" + @mouseout.native="mouseout" + @mouseover.native="mouseover" >