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/aura/WeeklyReport/WeeklyReport.css | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
index 98e8382..9e156cb 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
@@ -4,9 +4,10 @@
.THIS.height100vh {
height: 100vh;
}
-.THIS.contents_wrapper {
+/* .THIS.contents_wrapper {
padding-top: 50px;
-}
+ width: 105%;
+} */
.THIS .mt5 {
margin-top: 5px;
}
@@ -20,10 +21,14 @@
}
.THIS .no_data_area {
text-align: center;
+<<<<<<< HEAD
+ margin: 0.5em 0;
+=======
margin: .5em 0;
+>>>>>>> LEXCommunityLiJun
}
.THIS.report_list_area {
- margin: 40px 0 20px 100px;
+ margin: 40px 0 20px 0px;
height: 60vh;
overflow-y: scroll;
}
@@ -98,6 +103,48 @@
.THIS .animation_on {
opacity: 1;
}
+<<<<<<< HEAD
+.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 {
+=======
.THIS .divbotuser{
width:fit-content;
}
@@ -137,16 +184,59 @@
}
.THIS tr:hover .encrypt{
+>>>>>>> LEXCommunityLiJun
display: none;
}
/* add by Deloitte-Link 2023-6-19 start*/
+<<<<<<< HEAD
+.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;
+=======
.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
--
Gitblit v1.9.1