Merge pull request #2117 from fahad-aot/bugfix/FWF-3217-UI-issues

FWF-3217:[BUGFIX] Fixed ui fixes
AOT-Technologies · Jun 25, 2024 · 9078b78 · 9078b78
2 parents dac5fa0 + 4262b7a
commit 9078b78
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/forms-flow-web/src/components/Dashboard/StatusChart.js b/forms-flow-web/src/components/Dashboard/StatusChart.js
@@ -43,8 +43,8 @@ const ChartForm = React.memo((props) => {
           <div className=" d-flex align-items-center justify-content-between">
           <div>
           <div className="d-flex align-items-center">
-            <span className="text-primary me-2" >{t("Form Name")} : </span>
-            <h2 className="text-truncate" style={{ maxWidth: version > 1 ? "500px" : "700px", marginBottom: "30px"}}>{formName}</h2>
+            <span className="text-primary me-2 mt-2" >{t("Form Name")} : </span>
+            <h2 className="text-truncate mt-0" style={{ maxWidth: version > 1 ? "500px" : "700px"}}>{formName}</h2>
           </div>
           <p>
             <span className="text-primary" >{t("Latest Version")} :</span>{" "}

diff --git a/forms-flow-web/src/components/ServiceFlow/ServiceFlow.scss b/forms-flow-web/src/components/ServiceFlow/ServiceFlow.scss
@@ -67,10 +67,7 @@
 .mr-6{
   margin-right: 6px;
 }
-.assigned-user{
-  font-size: 18px;
-  margin-bottom: 3px;
-}
+
 .z-index{
   z-index: 9999;
 }

diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -697,14 +697,14 @@ export default function CreateNewFilterDrawer({
         </h5>
         <div className="d-flex align-items-center mt-1">
           <input
-            className="mr-6 mt-3"
+            className="me-1 mt-3"
             type="checkbox"
             checked={isMyTasksEnabled}
             onChange={(e) => setIsMyTasksEnabled(e.target.checked)}
             title={t("Show only current user assigned task")}
             disabled={viewMode}
           />
-          <h5 className="assigned-user mt-3">
+          <h5 className="mt-3">
             <Translation>
               {(t) => t("Show only current user assigned task")}
             </Translation>
@@ -715,7 +715,7 @@ export default function CreateNewFilterDrawer({
           <>
             <div className="d-flex align-items-center mt-1">
               <input
-                className="mr-6"
+                className="me-1 mt-3"
                 type="checkbox"
                 checked={isTasksForCurrentUserGroupsEnabled}
                 onChange={(e) =>
@@ -724,7 +724,7 @@ export default function CreateNewFilterDrawer({
                 title={t("Display authorized tasks based on user roles")}
                 disabled={viewMode}
               />
-              <h5 className="assigned-user">
+              <h5 className="mt-3">
                 <Translation>
                   {(t) => t("Display authorized tasks based on user roles")}
                 </Translation>
@@ -743,7 +743,7 @@ export default function CreateNewFilterDrawer({
 
         <div className="my-2">
           <label htmlFor="select-workflow">
-            <h5 className="mt-2 fs-18 fw-bold">
+            <h5 className="mt-2 fw-bold">
               <Translation>{(t) => t("Workflow")}</Translation>
             </h5>
           </label>