From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg
---
force-app/main/default/aura/WeeklyReport/WeeklyReport.css | 74 ------------------------------------
1 files changed, 1 insertions(+), 73 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
index 9e156cb..7e0b372 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
@@ -21,11 +21,7 @@
}
.THIS .no_data_area {
text-align: center;
-<<<<<<< HEAD
margin: 0.5em 0;
-=======
- margin: .5em 0;
->>>>>>> LEXCommunityLiJun
}
.THIS.report_list_area {
margin: 40px 0 20px 0px;
@@ -103,7 +99,6 @@
.THIS .animation_on {
opacity: 1;
}
-<<<<<<< HEAD
.THIS .divbotuser {
width: fit-content;
}
@@ -144,52 +139,10 @@
}
.THIS tr:hover .encrypt {
-=======
-.THIS .divbotuser{
- width:fit-content;
-}
-
-.THIS .toastMessage.forceActionsText{
- white-space : pre-line !important;
-}
-
-.THIS .slds-file-selector__dropzone .slds-file-selector__text{
- display: none;
-}
-
-.THIS .slds-input:focus, .THIS .slds-input:active {
- border-color: rgb(216, 221, 230);
- box-shadow: none;
-}
-
-.THIS .customRequired{
- font-weight: 400;
-}
-.THIS .customRequired:before{
- content: "*";
- margin: 0 0.125rem 0 0.125rem;
- color: rgb(194, 57, 52);
- float: left;
-}
-.THIS .none{
- display:none;
-}
-
-.THIS tr .decrypt{
- display: none;
-}
-
-.THIS tr:hover .decrypt{
- display: unset;
-}
-
-.THIS tr:hover .encrypt{
->>>>>>> LEXCommunityLiJun
display: none;
}
/* add by Deloitte-Link 2023-6-19 start*/
-<<<<<<< HEAD
.THIS .weeklyReportSpinner {
top: 100px;
}
@@ -213,30 +166,5 @@
}
.THIS .custom-input .uiInput {
height: 2rem;
-=======
-.THIS .weeklyReportSpinner{
- top:100px;
}
-
-.THIS .weeklyReportSpinnerEdit{
- top:50px;
-}
-
-.THIS .slds-spinner_container{
- position: absolute;
- top:100px;
-}
-
-.THIS .slds-spinner_containerEdit{
- position: absolute;
- top:50px;
-}
-
-.THIS .marginTop{
- margin-top: 10px;
-}
-.THIS .custom-input .uiInput {
- height: 2rem;
->>>>>>> LEXCommunityLiJun
-}
-/* add by Deloitte-Link 2023-6-19 end*/
\ No newline at end of file
+/* add by Deloitte-Link 2023-6-19 end*/
--
Gitblit v1.9.1