Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
KorirC committed Oct 5, 2021
1 parent f15d6d9 commit a180617
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,8 @@
}
}

.customRow {
display: grid;
grid-auto-flow: column;
grid-template-columns: max-content;
.customRow tbody{
white-space: nowrap;
}

.backgroundDataFetchingIndicator {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ const BiometricsPagination: React.FC<BiometricsPaginationProps> = ({
<TableContainer>
<DataTable rows={paginatedBiometrics} headers={tableHeaders} isSortable size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} className={styles.customRow}>
<TableHead>
<TableRow className={styles.customRow}>
<TableRow>
{headers.map((header) => (
<TableHeader
className={`${styles.productiveHeading01} ${styles.text02}`}
Expand All @@ -53,7 +53,7 @@ const BiometricsPagination: React.FC<BiometricsPaginationProps> = ({
</TableHead>
<TableBody>
{rows.map((row) => (
<TableRow key={row.id} className={styles.customRow}>
<TableRow key={row.id}>
{row.cells.map((cell) => (
<TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@
justify-content: end;
}

.customRow {
display: grid;
grid-auto-flow: column;
grid-template-columns: max-content;
.customRow tbody{
white-space: nowrap;
}

.backgroundDataFetchingIndicator {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ const VitalsPagination: React.FC<VitalsPaginationProps> = ({
<TableContainer>
<DataTable rows={paginatedVitals} headers={tableHeaders} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()} useZebraStyles>
<Table {...getTableProps()} useZebraStyles className={styles.customRow}>
<TableHead>
<TableRow className={styles.customRow}>
<TableRow>
{headers.map((header) => (
<TableHeader
className={`${styles.productiveHeading01} ${styles.text02}`}
Expand All @@ -52,7 +52,7 @@ const VitalsPagination: React.FC<VitalsPaginationProps> = ({
</TableHead>
<TableBody>
{rows.map((row) => (
<TableRow key={row.id} className={styles.customRow}>
<TableRow key={row.id}>
{row.cells.map((cell) => (
<TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
))}
Expand Down

0 comments on commit a180617

Please sign in to comment.