From 452023426e177645ae826925755a98af0bf11607 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 21 五月 2026 15:16:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/layout/components/AppMain.vue | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index c3d9416..a511014 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -38,34 +38,33 @@
<style lang="scss" scoped>
.app-main {
- /* 50= navbar 50 */
- min-height: calc(100vh - 50px);
- width: 100%;
- position: relative;
- overflow: hidden;
+ min-height: calc(100vh - var(--topbar-height));
+ width: 100%;
+ position: relative;
+ overflow: visible;
background: transparent;
}
.route-view-wrapper {
width: 100%;
height: 100%;
- padding: 108px 16px 24px 0;
+ padding: var(--content-gap);
+ padding-top: 0;
}
.fixed-header + .app-main {
padding-top: 0;
}
-
-.hasTagsView {
- .app-main {
- /* 84 = navbar + tags-view = 50 + 34 */
- min-height: calc(100vh - 84px);
- }
-
- .fixed-header + .app-main {
- padding-top: 0;
+
+.hasTagsView {
+ .app-main {
+ min-height: calc(100vh - var(--topbar-height) - var(--tagsbar-height));
}
-}
+
+ .fixed-header + .app-main {
+ padding-top: 0;
+ }
+}
</style>
<style lang="scss">
@@ -81,13 +80,13 @@
height: 6px;
}
-::-webkit-scrollbar-track {
- background-color: rgba(218, 225, 220, 0.8);
-}
-
-::-webkit-scrollbar-thumb {
- background-color: #b2bdb5;
- border-radius: 3px;
-}
+::-webkit-scrollbar-track {
+ background-color: rgba(218, 225, 220, 0.8);
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #b2bdb5;
+ border-radius: 3px;
+}
</style>
--
Gitblit v1.9.3