diff --git a/src/assets/images/logo-x.png b/src/assets/images/logo-x.png new file mode 100644 index 0000000..6e1f4e9 Binary files /dev/null and b/src/assets/images/logo-x.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png deleted file mode 100644 index 79805ce..0000000 Binary files a/src/assets/images/logo.png and /dev/null differ diff --git a/src/assets/images/menu_bg_02.png b/src/assets/images/menu_bg_02.png new file mode 100644 index 0000000..aaf989e Binary files /dev/null and b/src/assets/images/menu_bg_02.png differ diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 17381fc..7655962 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -11,6 +11,7 @@ transition: width 0.28s; width: $sideBarWidth !important; background-color: $menuBg; + background: url(../images/menu_bg_02.png) no-repeat left bottom #fff; height: 100%; position: fixed; font-size: 0; diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 179bd0f..a3cf334 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -11,15 +11,15 @@ $panGreen: #30B08F; // sidebar $menuText:#bfcbd9; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; +$subMenuActiveText:#f4f4f5; -$menuBg:#304156; +$menuBg:#fff; $menuHover:#263445; -$subMenuBg:#1f2d3d; +$subMenuBg:#fff; $subMenuHover:#001528; -$sideBarWidth: 205px; +$sideBarWidth: 264px; :export { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 3d805df..5d47ee3 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -7,8 +7,11 @@ @@ -30,25 +33,14 @@ export default { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index e504969..db7b566 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,82 +1,22 @@