From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
index 8cbd05f..c51f858 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
@@ -1,26 +1,26 @@
.THIS {
}
-.THIS .name{
- margin-right:0.5cm;
+.THIS .name {
+ margin-right: 0.5cm;
}
-.THIS .wh{
+.THIS .wh {
width: 670px;
height: 500px;
}
-.THIS .slds-modal__container{
- max-width:70rem !important;
- width:90% !important;
+.THIS .slds-modal__container {
+ max-width: 70rem !important;
+ width: 90% !important;
}
-.THIS .modal-body{
- height : 500px !important;
+.THIS .modal-body {
+ height: 500px !important;
max-height: 500px !important;
}
-.THIS table{
+.THIS table {
border-collapse: collapse;
border-spacing: 0;
width: 98%;
@@ -28,16 +28,16 @@
/* border: 1px solid #000000; */
text-align: center;
}
-.THIS tr{
+.THIS tr {
/* border: 1px solid #000000; */
text-align: center;
}
-.THIS td{
+.THIS td {
/* border: 1px solid #000000; */
text-align: center;
}
-.THIS th{
+.THIS th {
/* border: 1px solid #000000; */
text-align: center;
}
@@ -48,7 +48,7 @@
height: 80px;
}
-.THIS.exampleHolder{
+.THIS.exampleHolder {
position: relative;
display: inline-block;
margin-left: 15px;
@@ -57,14 +57,16 @@
white-space: nowrap;
}
-.THIS .searchButton{
- margin-top:20px;
- margin-left:20px;
+.THIS .searchButton {
+ margin-top: 20px;
+ margin-left: 20px;
}
-.THIS .slds-spinner_container{
+.THIS .slds-spinner_container {
position: revert;
}
+<<<<<<< HEAD
+=======
.THIS .slds-backdrop2 {
position: fixed;
@@ -76,4 +78,5 @@
}
.THIS .slds-backdrop_open2 {
z-index: 9003; /* 閬僵灞傜殑灞傜骇锛岄渶瑕佺‘淇濇瘮妯℃�佹鐨勫眰绾ч珮 */
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1