Merge branch 'dev' into system

# Conflicts:
#	src/assets/sass/utils.scss
This commit is contained in:
du.meimei
2025-04-23 10:48:15 +08:00
parent a8e82342fb
commit 84375ffab2
3 changed files with 3 additions and 1 deletions

View File

@@ -350,6 +350,7 @@ h3 {
transition: width 0.28s; transition: width 0.28s;
width: 210px !important; width: 210px !important;
background-color: #f0f4fa; background-color: #f0f4fa;
border: none;
padding: 10px; padding: 10px;
height: 100%; height: 100%;
position: fixed; position: fixed;

View File

@@ -10,6 +10,7 @@
transition: width 0.28s; transition: width 0.28s;
width: $sideBarWidth !important; width: $sideBarWidth !important;
background-color: #f0f4fa; background-color: #f0f4fa;
border: none;
padding: 10px; padding: 10px;
height: 100%; height: 100%;
position: fixed; position: fixed;

View File

@@ -143,7 +143,7 @@ h3 {
text-align: right; text-align: right;
} }
.container { .container {
padding: 20px; padding: 20px 20px 20px 10px;
//margin: 15px; //margin: 15px;
//background: #fff; //background: #fff;
} }