From 36990e3fc35d1dcf341895b65cba19a0d805f258 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期三, 16 四月 2025 20:13:00 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems
---
zhitan-vue/src/layout/components/AppMain.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/zhitan-vue/src/layout/components/AppMain.vue b/zhitan-vue/src/layout/components/AppMain.vue
index 328df52..220b6cc 100644
--- a/zhitan-vue/src/layout/components/AppMain.vue
+++ b/zhitan-vue/src/layout/components/AppMain.vue
@@ -13,7 +13,7 @@
<script setup>
import iframeToggle from "./IframeToggle/index"
-import useTagsViewStore from '@/store/modules/tagsView'
+import useTagsViewStore from "@/store/modules/tagsView"
const tagsViewStore = useTagsViewStore()
</script>
@@ -27,21 +27,23 @@
position: relative;
overflow: hidden;
background: #110f2e;
+ padding: 14px;
+ box-sizing: border-box;
+ padding-top: 8px;
}
.fixed-header + .app-main {
- padding-top: 50px;
+ padding-top: 82px;
}
.hasTagsView {
.app-main {
- /* 84 = navbar + tags-view = 50 + 34 */
- min-height: calc(100vh - 120px);
- // padding: 20px;
+ /* 84 = navbar + tags-view + padding = 70 + 56 + 14 */
+ min-height: calc(100vh - 110px);
}
.fixed-header + .app-main {
- padding-top: 84px;
+ padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
}
}
}
@@ -53,25 +55,30 @@
width: 100%;
position: relative;
overflow: hidden;
- background: #F7F8FA;
+ background: #f7f8fa;
+ padding: 14px;
+ box-sizing: border-box;
}
.fixed-header + .app-main {
- padding-top: 50px;
+ padding-top: 82px;
}
.hasTagsView {
.app-main {
- /* 84 = navbar + tags-view = 50 + 34 */
- // 70+50
- min-height: calc(100vh - 120px);
- // padding: 20px;
+ /* 84 = navbar + tags-view + padding = 70 + 56 + 14 */
+ min-height: calc(100vh - 110px);
}
.fixed-header + .app-main {
- padding-top: 84px;
+ padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
}
}
+}
+
+/* 鐢ㄦ埛涓汉璧勬枡椤电壒娈婇珮搴﹀鐞� */
+.user-profile-container {
+ min-height: calc(100vh - 50px) !important;
}
</style>
@@ -97,4 +104,3 @@
border-radius: 3px;
}
</style>
-
--
Gitblit v1.9.3