Merge branch 'AOT-Technologies:develop' into develop

kiran-aot · Feb 7, 2024 · c9649d7 · c9649d7
2 parents 154503e + 384ba8c
commit c9649d7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 32 deletions.
diff --git a/forms-flow-web/src/assets/styles/themes.scss b/forms-flow-web/src/assets/styles/themes.scss
diff --git a/forms-flow-web/src/components/Application/Application.scss b/forms-flow-web/src/components/Application/Application.scss
@@ -1,4 +1,3 @@
-@import "./../../assets/styles/themes.scss";
 .div-no-application {
     margin-top: 10%;
     margin-bottom: 10%;

diff --git a/forms-flow-web/src/components/Error/loadError.scss b/forms-flow-web/src/components/Error/loadError.scss
@@ -1,5 +1,3 @@
-@import "./../../assets/styles/themes.scss";
-
 .error-message-block {
   align-items: center;
   display: flex;

diff --git a/forms-flow-web/src/components/Footer/Footer.js b/forms-flow-web/src/components/Footer/Footer.js
@@ -1,5 +1,4 @@
 import React from "react";
-import "./footer.scss";
 import { version } from "../../../package.json";
 import { Translation } from "react-i18next";
 

diff --git a/forms-flow-web/src/components/Footer/footer.scss b/forms-flow-web/src/components/Footer/footer.scss
diff --git a/forms-flow-web/src/components/Form/Item/Preview.js b/forms-flow-web/src/components/Form/Item/Preview.js
@@ -139,7 +139,6 @@ const Preview = ({handleNext, hideComponents, activeStep}) => {
         setNewpublishClicked(false);
       });
   };
-
 
 
   const gotoEdit = () =>{
@@ -225,7 +224,14 @@ const Preview = ({handleNext, hideComponents, activeStep}) => {
         <Form
           form={form}
           hideComponents={hideComponents}
-          options={{ disabled: { submit: true }, language: lang, i18n: formio_resourceBundles }}
+          options={{ disabled: { submit: true },
+          buttonSettings: {
+            showSubmit: false
+          },
+          disableAlerts: true,
+          noAlerts: true,
+          language: lang, i18n: formio_resourceBundles }}
+
         />
       </LoadingOverlay>
     </div>

diff --git a/forms-flow-web/src/components/Loading/loading.scss b/forms-flow-web/src/components/Loading/loading.scss
@@ -1,5 +1,3 @@
-@import "./../../assets/styles/themes.scss";
-
 .footer {
   position: absolute;
   bottom: 0;

diff --git a/forms-flow-web/src/components/ServiceFlow/details/TaskDetail.scss b/forms-flow-web/src/components/ServiceFlow/details/TaskDetail.scss
@@ -4,7 +4,7 @@
   width: 90%;
   right: 0;
   margin-left: 10%;
-  color:#2780e3;
+  color:var(--color-primary-lt);
 }
 .select-user__value-container{
   height: 35px;
@@ -15,7 +15,7 @@
 .btn-pos {
   padding: 0.30rem 0.5rem !important;
   border-radius: 0 !important;
-  border: 1px solid rgb(184, 184, 184) !important;
+  border: 1px solid var(--color-gray-400) !important;
 }
 .group-align{
 display:-webkit-box;

diff --git a/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarListView.scss b/forms-flow-web/src/components/ServiceFlow/list/search/TaskSearchBarListView.scss
@@ -51,6 +51,12 @@
     align-items: center;
     justify-content: center;
 }
+
+.react-datepicker__week {
+    white-space: nowrap;
+    display: flex;
+}
+
 .filter-cancel-btn-container {
     margin-left: -10px;
     margin-right: -10px;