fix: 🐛 混合、顶部导航栏模式固定header下间距,混合模式左侧菜单高度不固定等样式问题修复

Former-commit-id: 63df66449582f41a710f761457e4afd21113aeb7
This commit is contained in:
郝先瑞
2023-09-04 20:54:46 +08:00
parent 5fd62c26fe
commit ff86b1a4a9
7 changed files with 86 additions and 48 deletions

View File

@@ -28,7 +28,7 @@ const tagsViewStore = useTagsViewStore();
}
.fixed-header + .app-main {
padding-top: 50px;
padding-top: 34px;
}
.hasTagsView {
@@ -42,4 +42,31 @@ const tagsViewStore = useTagsViewStore();
padding-top: 84px;
}
}
.isMix {
.app-main {
height: calc(100vh - 50px);
overflow-y: auto;
}
.hasTagsView {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
height: calc(100vh - 84px);
}
.fixed-header + .app-main {
min-height: calc(100vh - 50px);
padding-top: 34px;
}
}
}
.isTop {
.hasTagsView {
.fixed-header + .app-main {
padding-top: 34px;
}
}
}
</style>

View File

@@ -10,6 +10,8 @@ defineProps({
},
});
const layout = computed(() => settingsStore.layout);
const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);
</script>
@@ -25,7 +27,7 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);
to="/"
>
<img v-if="settingsStore.sidebarLogo" :src="logo" class="w-5 h-5" />
<span v-else class="ml-3 text-white text-sm font-bold"
<span v-if="layout == 'top'" class="ml-3 text-white text-sm font-bold"
>vue3-element-admin</span
>
</router-link>