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 | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
index ce905ad..f39a0c1 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
@@ -1,43 +1,74 @@
-@import "c/lexCssUtility";
+@import 'c/lexCssUtility';
+<<<<<<< HEAD
.outerBorderCss {
- border: 1px solid #d4d4d4;
- border-radius: 5px;
- border-top: 3px solid #565959;
+ 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;
+ 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;
+ border-top: 1px solid #565959;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
}
.centerCss {
- text-align: center;
+ text-align: center;
}
.centerCss .left {
- margin-left: 100px;
+=======
+.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 {
- max-height: 400px !important;
+ max-height: 400px !important;
}
.tableColumn {
- margin-top: 5px !important;
- overflow-x: auto;
+ margin-top: 5px !important;
+ overflow-x: auto;
}
:host {
- --lwc-inputStaticFontSize: 16px;
- --lwc-formLabelFontSize: 16px;
+ --lwc-inputStaticFontSize: 16px;
+ --lwc-formLabelFontSize: 16px;
}
.fileUpload {
- font-size: 16px;
- --lwc-formLabelFontSize: 16px;
+ font-size: 16px;
+<<<<<<< HEAD
+ --lwc-formLabelFontSize: 16px;
+=======
+ --lwc-formLabelFontSize:16px;
+>>>>>>> LEXCommunityLiJun
}
.disable-row-selection .slds-is-selected {
- outline: none !important;
+ outline: none !important;
+<<<<<<< HEAD
}
+=======
+ }
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1