From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/formdragelement/index.scss | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index e4b9d51..436e4e2 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -26,8 +26,7 @@
}
}
.am-list-item {
- font-size: 16px;
- // padding-left: 10px;
+ // font-size: 16px;
position: relative;
display: flex;
height: 44px;
@@ -49,8 +48,6 @@
overflow: hidden;
.am-input-label {
width: 28%;
- color: #000;
- font-size: 16px;
margin-left: 0;
margin-right: 5px;
text-align: left;
@@ -58,16 +55,21 @@
overflow: hidden;
padding: 2px 0;
text-overflow: ellipsis;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
}
.am-list-switch {
flex: 1;
text-align: right;
}
.am-input-control {
- font-size: 16px;
flex: 1 1;
text-align: right;
padding-right: 15px;
+ font-size: 16px;
+ font-weight: normal;
+ color: rgba(0, 0, 0, 0.65);
}
.am-input-control.left {
text-align: left;
@@ -77,6 +79,9 @@
width: 15px;
height: 15px;
margin-left: 8px;
+ font-size: 16px;
+ font-weight: normal;
+ color: rgba(0, 0, 0, 0.65);
.anticon {
vertical-align: top;
}
@@ -124,10 +129,22 @@
line-height: 2;
}
.am-input-control {
- font-size: 14px;
line-height: 1.5;
text-align: left;
padding-bottom: 5px;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
+ }
+ }
+ }
+ .am-list-item.formula {
+ .am-list-line {
+ .am-input-control {
+ font-size: inherit;
+ font-weight: inherit;
+ color: inherit;
+ padding-right: 0px;
}
}
}
@@ -231,8 +248,9 @@
}
}
.split-line {
- color: #1890ff;
- font-size: 16px;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
padding-left: 10px;
padding-top: 10px;
border-bottom: 1px solid #e9e9e9;
@@ -240,10 +258,22 @@
.check-card-edit-box .card-cell span {
line-height: 1.5;
}
+ .split-wrap.ant-form-item {
+ color: #1890ff;
+ font-size: 16px;
+ }
.ant-form-item {
cursor: move;
display: flex;
margin-bottom: 0px;
+ color: #000;
+ font-weight: normal;
+ font-size: 14px;
+
+ * {
+ font-weight: inherit;
+ }
+
.ant-form-item-control-wrapper::after {
content: '';
position: absolute;
--
Gitblit v1.8.0