From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
index c28189d..f39a0c1 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
@@ -1,4 +1,5 @@
@import 'c/lexCssUtility';
+<<<<<<< HEAD
.outerBorderCss {
border: 1px solid #d4d4d4;
border-radius: 5px;
@@ -19,6 +20,28 @@
text-align: center;
}
.centerCss .left {
+=======
+.outerBorderCss{
+ border: 1px solid #D4D4D4;
+ border-radius : 5px;
+ border-top : 3px solid #565959;
+}
+.borderCss{
+ border: 1px solid #D4D4D4;
+ border-radius : 5px;
+ margin-bottom : 7px;
+ border-top : 3px solid #565959;
+}
+.headerDorderCss{
+ border-top: 1px solid #565959;
+ border-bottom: 1px solid #D4D4D4;
+ padding:3px;
+}
+.centerCss{
+ text-align: center;
+}
+.centerCss .left{
+>>>>>>> LEXCommunityLiJun
margin-left: 100px;
}
.datatable {
@@ -35,9 +58,17 @@
.fileUpload {
font-size: 16px;
+<<<<<<< HEAD
--lwc-formLabelFontSize: 16px;
+=======
+ --lwc-formLabelFontSize:16px;
+>>>>>>> LEXCommunityLiJun
}
.disable-row-selection .slds-is-selected {
outline: none !important;
+<<<<<<< HEAD
}
+=======
+ }
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1