Merge branch 'ts' into dev

# Conflicts: # package.json # src/layout/components/TagsView/index.vue
2023-05-06 09:25:05 +08:00
parent 7cfaeb5531 9b6cd8b047
commit bf4a8543ca
23 changed files with 239 additions and 164 deletions
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@ -1,6 +1,6 @@
 #app {
  .main-container {
-    min-height: 100%;
+    height: 100%;
    transition: margin-left 0.28s;
    margin-left: $base-sidebar-width;
    position: relative;