From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/assets/styles/sidebar.scss | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zhitan-vue/src/assets/styles/sidebar.scss b/zhitan-vue/src/assets/styles/sidebar.scss
index 297e8e4..0d8d071 100644
--- a/zhitan-vue/src/assets/styles/sidebar.scss
+++ b/zhitan-vue/src/assets/styles/sidebar.scss
@@ -13,6 +13,7 @@
.main-container {
+ background-color: #110f2e !important;
height: 100%;
transition: margin-left 0.28s;
margin-left: $base-sidebar-width;
@@ -28,7 +29,7 @@
transition: width 0.28s;
width: $base-sidebar-width !important;
background-color: $base-menu-background;
- height: 100%;
+ height: calc(100% - 60px) !important;
position: fixed;
top: 60px;
bottom: 0;
@@ -306,6 +307,7 @@
}
.main-container {
+ background-color: #f7f8fa;
height: 100%;
transition: margin-left 0.28s;
margin-left: $base-sidebar-width;
@@ -321,7 +323,7 @@
transition: width 0.28s;
width: $base-sidebar-width !important;
background-color: $base-menu-background;
- height: 100%;
+ height: calc(100% - 60px) !important;
position: fixed;
top: 60px;
bottom: 0;
@@ -389,7 +391,7 @@
.menu-title {
overflow: hidden !important;
font-weight: 400 !important;
- font-size: 16px !important;
+ font-size: 14px !important;
}
// @media (min-width: 1440px) {
--
Gitblit v1.9.3