From af2924fb5678f9dd72a210aeec230ae019823a43 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期六, 09 十月 2021 11:12:30 +0800
Subject: [PATCH] zzjv2.1
---
src/pages/settings/views/generalSettings.vue | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 026e3c5..4f55b2f 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -665,28 +665,7 @@
}
.bar-group {
overflow: auto;
-<<<<<<< HEAD
- height: 400px;
- }
- .bar {
- height: 48px;
- background-color: #f8f8f8;
- border-radius: 10px;
- line-height: 48px;
- box-sizing: border-box;
- padding: 0 20px 0 20px;
- font-weight: 700;
- display: flex;
- justify-content: space-between;
- margin-bottom: 2px;
- border: 2px solid #fff;
- .name {
- font-size: 14px;
- }
- .btns {
- width: 52px;
-=======
- height: 520px;
+ height: calc(100% - 132px);
.general-bar {
height: 48px;
background-color: #f8f8f8;
@@ -695,7 +674,6 @@
box-sizing: border-box;
padding: 0 20px 0 20px;
font-weight: 700;
->>>>>>> 0892efe5131551631fe287cfda29e59e4f2f6707
display: flex;
justify-content: space-between;
margin-bottom: 2px;
--
Gitblit v1.8.0