From 4d010f1940db29c1effc0f9bd6a975436c1183d9 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 13 十月 2021 13:53:55 +0800
Subject: [PATCH] 解决冲突
---
src/pages/settings/views/generalSettings.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 51d202a..738019d 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -574,6 +574,9 @@
flex: 1;
flex-basis: auto;
box-sizing: border-box;
+ .el-input__inner {
+ height: 24px !important;
+}
.general-center {
height: 100%;
width: 300px;
@@ -1148,9 +1151,7 @@
color: #4E94FF;
}
-.el-input__inner {
- height: 24px !important;
-}
+
/* .el-tooltip__popper {
--
Gitblit v1.8.0