(fix) remove blank div from lab tabs (#49)

openmrs · Feb 6, 2024 · 970da4a · 970da4a
1 parent e0818a9
commit 970da4a
Show file tree

Hide file tree

Showing 17 changed files with 526 additions and 609 deletions.
diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx
@@ -163,12 +163,7 @@ const CompletedList: React.FC<CompletedListProps> = ({ fulfillerStatus }) => {
   }
 
   if (paginatedWorkListEntries?.length > 0) {
-    return (
-      <div>
-        <div className={styles.headerBtnContainer}></div>
-        <DataTable rows={tableRows} headers={tableColumns} useZebraStyles />
-      </div>
-    );
+    return <DataTable rows={tableRows} headers={tableColumns} useZebraStyles />;
   } else {
     return (
       <div className={styles.tileContainer}>

diff --git a/src/completed-list/completed-list.scss b/src/completed-list/completed-list.scss
@@ -123,12 +123,6 @@ title {
   }
 }
 
-.headerBtnContainer {
-  background-color: $ui-background;
-  padding: spacing.$spacing-05;
-  text-align: right;
-}
-
 .searchContainer {
   display: flex;
   align-items: center;
@@ -193,7 +187,6 @@ title {
 .tableLayerSearch {
   margin: 5px;
   padding: 10px;
-
 }
 
 .dropDownContainer {
@@ -207,7 +200,6 @@ title {
   margin: 10px;
 }
 
-
 .tileContainer {
   background-color: $ui-02;
   border-top: 1px solid $ui-03;
@@ -230,4 +222,3 @@ title {
   color: $text-02;
   margin-bottom: 0.5rem;
 }
-
diff --git a/src/lab-tabs/approved-tab.component.tsx b/src/lab-tabs/approved-tab.component.tsx
@@ -5,7 +5,6 @@ import styles from "../queue-list/laboratory-queue.scss";
 const ApprovedComponent = () => {
   return (
     <div>
-      <div className={styles.headerBtnContainer}></div>
       <CompletedList fulfillerStatus={"COMPLETED"} />
     </div>
   );

diff --git a/src/lab-tabs/referred-tab.component.tsx b/src/lab-tabs/referred-tab.component.tsx
@@ -5,8 +5,6 @@ import styles from "../queue-list/laboratory-queue.scss";
 const ReferredComponent = () => {
   return (
     <div>
-      <div className={styles.headerBtnContainer}></div>
-
       <EmptyState
         displayText={"referred tests"}
         headerTitle={"Referred tests"}

diff --git a/src/lab-tabs/review-tab.component.tsx b/src/lab-tabs/review-tab.component.tsx
@@ -5,7 +5,6 @@ import styles from "../queue-list/laboratory-queue.scss";
 const ReviewComponent = () => {
   return (
     <div>
-      <div className={styles.headerBtnContainer}></div>
       <ReviewList fulfillerStatus={"IN_PROGRESS"} />
     </div>
   );

diff --git a/src/lab-tabs/work-list-tab.component.tsx b/src/lab-tabs/work-list-tab.component.tsx
@@ -5,7 +5,6 @@ import styles from "../queue-list/laboratory-queue.scss";
 const WorkListComponent = () => {
   return (
     <div>
-      <div className={styles.headerBtnContainer}></div>
       <WorkList fulfillerStatus={"IN_PROGRESS"} />
     </div>
   );

diff --git a/src/patient-chart/laboratory-order.scss b/src/patient-chart/laboratory-order.scss
@@ -2,65 +2,60 @@
 @use '@carbon/styles/scss/type';
 @import "~@openmrs/esm-styleguide/src/vars";
 @import '../root.scss';
-.headerBtnContainer {
-    background-color: $ui-background;
-    padding: spacing.$spacing-05;
-    text-align: right;
-  }
 
-  .tileContainer {
-    background-color: $ui-02;
-    border-top: 1px solid $ui-03;
-    padding: 5rem 0;
-  }
-
-  .tile {
-    margin: auto;
-    width: fit-content;
-  }
-
-  .tileContent {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+.tileContainer {
+  background-color: $ui-02;
+  border-top: 1px solid $ui-03;
+  padding: 5rem 0;
+}
+
+.tile {
+  margin: auto;
+  width: fit-content;
+}
+
+.tileContent {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.content {
+  @include type.type-style('heading-compact-02');
+  color: $text-02;
+  margin-bottom: 0.5rem;
+}
+
+.helper {
+  @include type.type-style('body-compact-01');
+  color: $text-02;
+}
+
+.separator {
+  @include type.type-style('body-compact-02');
+  color: $text-02;
+  width: 80%;
+  margin: 1.5rem auto;
+  overflow: hidden;
+  text-align: center;
+
+  &::before,
+  &::after {
+    background-color: $text-03;
+    content: '';
+    display: inline-block;
+    height: 1px;
+    position: relative;
+    vertical-align: middle;
+    width: 50%;
   }
-  .content {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-    margin-bottom: 0.5rem;
+
+  &::before {
+    right: 0.5rem;
+    margin-left: -50%;
   }
-  
-  .helper {
-    @include type.type-style('body-compact-01');
-    color: $text-02;
+
+  &::after {
+    left: 0.5rem;
+    margin-right: -50%;
   }
-
-  .separator {
-    @include type.type-style('body-compact-02');
-    color: $text-02;
-    width: 80%;
-    margin: 1.5rem auto;
-    overflow: hidden;
-    text-align: center;
-
-    &::before,
-    &::after {
-      background-color: $text-03;
-      content: '';
-      display: inline-block;
-      height: 1px;
-      position: relative;
-      vertical-align: middle;
-      width: 50%;
-    }
-
-    &::before {
-      right: 0.5rem;
-      margin-left: -50%;
-    }
-
-    &::after {
-      left: 0.5rem;
-      margin-right: -50%;
-    }
-  }
+}
diff --git a/src/patient-chart/results-summary/print-results-summary.scss b/src/patient-chart/results-summary/print-results-summary.scss
@@ -20,12 +20,6 @@
     margin: 5px;
   }
 
-  .headerBtnContainer {
-    background-color: $ui-background;
-    padding: spacing.$spacing-05;
-    text-align: right;
-  }
-
   .tileContainer {
     background-color: $ui-02;
     border-top: 1px solid $ui-03;
@@ -89,17 +83,16 @@
     border-collapse: collapse;
     width: 100%;
   }
-  
+
   td, th {
     border: 1px solid #000;
     text-align: left;
     font-size: 8px;
     padding: 8px;
     width: 80px;
   }
-  
+
   th {
     background-color: #f2f2f2;
   }
-
-}
+}