diff --git a/public/index.html b/public/index.html index cf6fc3d..54b4ffe 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - + <%= webpackConfig.name %> diff --git a/public/logo2.ico b/public/logo2.ico new file mode 100644 index 0000000..8e551cf Binary files /dev/null and b/public/logo2.ico differ diff --git a/src/assets/images/login-bg.png b/src/assets/images/login-bg.png index b190835..cc8ce60 100644 Binary files a/src/assets/images/login-bg.png and b/src/assets/images/login-bg.png differ diff --git a/src/assets/index/topIcon1.png b/src/assets/index/topIcon1.png new file mode 100644 index 0000000..dfcfbfa Binary files /dev/null and b/src/assets/index/topIcon1.png differ diff --git a/src/assets/index/topIcon2.png b/src/assets/index/topIcon2.png new file mode 100644 index 0000000..a69b6c1 Binary files /dev/null and b/src/assets/index/topIcon2.png differ diff --git a/src/assets/index/topIcon3.png b/src/assets/index/topIcon3.png new file mode 100644 index 0000000..159a9ae Binary files /dev/null and b/src/assets/index/topIcon3.png differ diff --git a/src/assets/index/topIcon4.png b/src/assets/index/topIcon4.png new file mode 100644 index 0000000..f02b41a Binary files /dev/null and b/src/assets/index/topIcon4.png differ diff --git a/src/assets/kitchen/topIcon1.png b/src/assets/kitchen/topIcon1.png deleted file mode 100644 index b6b8a2b..0000000 Binary files a/src/assets/kitchen/topIcon1.png and /dev/null differ diff --git a/src/assets/kitchen/topIcon2.png b/src/assets/kitchen/topIcon2.png deleted file mode 100644 index 502e947..0000000 Binary files a/src/assets/kitchen/topIcon2.png and /dev/null differ diff --git a/src/assets/kitchen/topIcon3.png b/src/assets/kitchen/topIcon3.png deleted file mode 100644 index ea0efe2..0000000 Binary files a/src/assets/kitchen/topIcon3.png and /dev/null differ diff --git a/src/assets/kitchen/topIcon4.png b/src/assets/kitchen/topIcon4.png deleted file mode 100644 index bfde5ee..0000000 Binary files a/src/assets/kitchen/topIcon4.png and /dev/null differ diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 9884894..746d5a1 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -19,10 +19,10 @@ transition: width 0.28s; width: $base-sidebar-width !important; background-color: $base-menu-background; - height: 90%; + height: 92%; position: absolute; font-size: 0px; - top: 84px; + top: 68px; bottom: 0; left: 0; z-index: 1001; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index a1a3c3a..5a3489c 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -29,7 +29,7 @@ export default { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a38bf2a..9c39513 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,7 +2,7 @@