From 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yxh01
---
src/assets/styles/sidebar.scss | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
similarity index 95%
rename from ruoyi-ui/src/assets/styles/sidebar.scss
rename to src/assets/styles/sidebar.scss
index ed308b8..fdb8adb 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -15,7 +15,8 @@
-webkit-transition: width .28s;
transition: width 0.28s;
width: $base-sidebar-width !important;
- background-color: $base-menu-background;
+ background: -webkit-linear-gradient(bottom, #3d6df8, #5b8cff);
+
height: 100%;
position: fixed;
font-size: 0px;
@@ -33,7 +34,7 @@
}
.scrollbar-wrapper {
- overflow-x: hidden !important;
+ background: url('~@/assets/common/leftnavBg.png') no-repeat 0 100%;
}
.el-scrollbar__bar.is-vertical {
@@ -46,7 +47,7 @@
&.has-logo {
.el-scrollbar {
- height: calc(100% - 50px);
+ height: calc(100% - 28px);
}
}
--
Gitblit v1.9.3