From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e2f76b6..49d586d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -82,7 +82,7 @@
}
.el-main__content {
- padding: var(--el-main-padding);
+ padding: var(--el-main-padding) calc(var(--el-main-padding) / 2);
max-height: calc(100vh - 60px - var(--el-main-padding) * 2);
/* background-color: aqua; */
/* overflow: auto; */
--
Gitblit v1.9.3