From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/components/layout/components/AppMain.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/layout/components/AppMain.vue b/src/components/layout/components/AppMain.vue
index 1572948..4c4dbb1 100644
--- a/src/components/layout/components/AppMain.vue
+++ b/src/components/layout/components/AppMain.vue
@@ -24,16 +24,16 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.app-main {
- margin-left: 10px;
box-sizing: border-box;
display: flex;
flex: 1;
flex-direction: column;
- // height: 100%;
- width: calc(100% - 210px);
+ width: calc(100% - 200px);
+
.app-main-content {
width: 100%;
overflow-y: hidden;
+ height: calc(100% - 50px);
}
}
</style>
--
Gitblit v1.8.0