bootstrap fixes for form ,submissions amd process tabs pages (AOT-Tec…

…hnologies#1823)
auslin-aot · Jan 2, 2024 · 6b642c2 · 6b642c2
1 parent 1f4b7da
commit 6b642c2
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 20 deletions.
diff --git a/forms-flow-web/src/components/Application/ApplicationFilter.js b/forms-flow-web/src/components/Application/ApplicationFilter.js
@@ -145,7 +145,7 @@ const ApplicationFilter = ({
               id="applicationStatus"
               value={searchParams.applicationStatus}
               onChange={(e) => handleChange("applicationStatus", e.target.value)}
-              className="form-control p-1"
+              className="form-select p-1 w-100"
               data-testid="submission-filter-applicationstatus-dropdown"
             >
               <option value="" hidden>

diff --git a/forms-flow-web/src/components/Application/ApplicationTable.js b/forms-flow-web/src/components/Application/ApplicationTable.js
@@ -106,7 +106,7 @@ const ApplicationTable = () => {
 
   const getNoDataIndicationContent = () => {
     return (
-      <div className="div-no-application">
+      <div className="div-no-application bg-transparent">
         <label className="lbl-no-application">
           {" "}
           <Translation>{(t) => t("No submissions found")}</Translation>{" "}

diff --git a/forms-flow-web/src/components/Form/Item/CreateTemplateConfirmModal.js b/forms-flow-web/src/components/Form/Item/CreateTemplateConfirmModal.js
@@ -22,13 +22,12 @@ const CreateTemplateConfirmModal = ({modalOpen,handleModalChange,onConfirm}) =>
             <div>
               <button
                 type="button"
-                className="close"
+                className="btn-close"
                 onClick={() => {
                   handleModalChange();
                 }}
                 aria-label="Close"
               >
-                <span aria-hidden="true">&times;</span>
               </button>
             </div>
           </Modal.Header>

diff --git a/forms-flow-web/src/components/Form/Item/FormHistoryModal.js b/forms-flow-web/src/components/Form/Item/FormHistoryModal.js
@@ -58,14 +58,13 @@ const FormHistoryModal = ({ historyModal, handleModalChange, gotoEdit }) => {
           <div>
             <button
               type="button"
-              className="close"
+              className="btn-close"
               onClick={() => {
                 setShowCount(3);
                 handleModalChange();
               }}
               aria-label="Close"
             >
-              <span aria-hidden="true">&times;</span>
             </button>
           </div>
         </Modal.Header>

diff --git a/forms-flow-web/src/components/Form/Item/SaveAsNewVersionConfirmationModal.js b/forms-flow-web/src/components/Form/Item/SaveAsNewVersionConfirmationModal.js
@@ -20,13 +20,12 @@ const SaveAsNewVersionConfirmationModal = ({modalOpen,handleModalChange,onConfir
       <div>
         <button
           type="button"
-          className="close"
+          className="btn-close"
           onClick={() => {
             handleModalChange();
           }}
           aria-label="Close"
         >
-          <span aria-hidden="true">&times;</span>
         </button>
       </div>
     </Modal.Header>

diff --git a/forms-flow-web/src/components/Form/Steps/PreviewStepper.js b/forms-flow-web/src/components/Form/Steps/PreviewStepper.js
@@ -403,7 +403,7 @@ if (reviewerSelectedOption === "Specific Reviewers") {
                             </Popover>
                           )}
                         >
-                          <Button id="addDesigner" className="btn btn-primary  btn-small">
+                          <Button id="addDesigner" className="btn btn-primary  btn-small mt-2">
                           <i className="fa-solid fa-plus me-2"></i>
                             <Translation>{(t) => t("Add")}</Translation>
                           </Button>
@@ -492,7 +492,7 @@ if (reviewerSelectedOption === "Specific Reviewers") {
                               </Popover>
                             )}
                           >
-                            <Button id="addClient" className="btn btn-primary btn-small ">
+                            <Button id="addClient" className="btn btn-primary btn-small mt-2">
                             <i className="fa-solid fa-plus me-2"></i>
                               <Translation>{(t) => t("Add")}</Translation>
                             </Button>
@@ -585,7 +585,7 @@ if (reviewerSelectedOption === "Specific Reviewers") {
                                 </Popover>
                               )}
                             >
-                              <Button id="addReviewer" className="btn btn-primary  btn-small ">
+                              <Button id="addReviewer" className="btn btn-primary  btn-small mt-2">
                               <i className="fa-solid fa-plus me-2"></i>
                                 <Translation>{(t) => t("Add")}</Translation>
                               </Button>

diff --git a/forms-flow-web/src/components/Form/constants/ClientTable.js b/forms-flow-web/src/components/Form/constants/ClientTable.js
@@ -198,8 +198,8 @@ function ClientTable() {
                         onClick={handleClearSearch}
                         data-testid="form-search-cear-button"
                       >
-                        <InputGroup.Text>
-                          <i className="fa fa-times"></i>
+                        <InputGroup.Text className="h-100">
+                          <i className="fa fa-times "></i>
                         </InputGroup.Text>
                       </InputGroup.Append>
                     )}
@@ -209,7 +209,7 @@ function ClientTable() {
                       disabled={!search?.trim()}
                       style={{ cursor: "pointer" }}
                     >
-                      <InputGroup.Text style={{ backgroundColor: "#ffff" }}>
+                      <InputGroup.Text style={{ backgroundColor: "#ffff" }} className="h-100">
                         <i className="fa fa-search"></i>
                       </InputGroup.Text>
                     </InputGroup.Append>

diff --git a/forms-flow-web/src/components/Form/constants/FormTable.js b/forms-flow-web/src/components/Form/constants/FormTable.js
@@ -242,7 +242,7 @@ function FormTable() {
                     />
                     {search && (
                       <InputGroup.Append onClick={handleClearSearch} data-testid="form-search-cear-button">
-                        <InputGroup.Text>
+                        <InputGroup.Text className="h-100">
                           <i className="fa fa-times"></i>
                         </InputGroup.Text>
                       </InputGroup.Append>
@@ -253,7 +253,7 @@ function FormTable() {
                       disabled={!search?.trim()}
                       style={{ cursor: "pointer" }}
                     >
-                      <InputGroup.Text style={{ backgroundColor: "#ffff" }}>
+                      <InputGroup.Text style={{ backgroundColor: "#ffff" }} className="h-100">
                         <i className="fa fa-search"></i>
                       </InputGroup.Text>
                     </InputGroup.Append>

diff --git a/forms-flow-web/src/components/Modeler/constants/bpmnTable.js b/forms-flow-web/src/components/Modeler/constants/bpmnTable.js
@@ -122,7 +122,7 @@ function BpmnTable() {
               />
               {search && (
                 <InputGroup.Append onClick={onClearSearch}>
-                  <InputGroup.Text>
+                  <InputGroup.Text className="h-100">
                     <i className="fa fa-times"></i>
                   </InputGroup.Text>
                 </InputGroup.Append>
@@ -132,7 +132,7 @@ function BpmnTable() {
                 disabled={!search?.trim()}
                 style={{ cursor: "pointer" }}
               >
-                <InputGroup.Text style={{ backgroundColor: "#ffff" }}>
+                <InputGroup.Text style={{ backgroundColor: "#ffff" }} className="h-100">
                   <i className="fa fa-search"></i>
                 </InputGroup.Text>
               </InputGroup.Append>

diff --git a/forms-flow-web/src/components/Modeler/constants/dmnTable.js b/forms-flow-web/src/components/Modeler/constants/dmnTable.js
@@ -124,7 +124,7 @@ function DmnTable() {
               />
               {search && (
                 <InputGroup.Append onClick={onClearSearch}>
-                  <InputGroup.Text>
+                  <InputGroup.Text className="h-100">
                     <i className="fa fa-times"></i>
                   </InputGroup.Text>
                 </InputGroup.Append>
@@ -134,7 +134,7 @@ function DmnTable() {
                 disabled={!search?.trim()}
                 style={{ cursor: "pointer" }}
               >
-                <InputGroup.Text style={{ backgroundColor: "#ffff" }}>
+                <InputGroup.Text style={{ backgroundColor: "#ffff" }} className="h-100">
                   <i className="fa fa-search"></i>
                 </InputGroup.Text>
               </InputGroup.Append>