Fixed merge conflict

ECN · Dec 17, 2020 · 6019e2b · 6019e2b
2 parents 3effeb7 + 56d6f28
commit 6019e2b
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js
@@ -12,14 +12,6 @@ export default function ItemTable({ data, rowCanBeSelected }) {
 
     const theme = useTheme();
     const useStyles = makeStyles({
-        // Fully visible for active icons
-        activeSortIcon: {
-            opacity: 1,
-        },
-        // Half visible for inactive icons
-        inactiveSortIcon: {
-            opacity: 0.2,
-        },
         rowSelected: {
             backgroundColor: theme.palette.type === 'light' ? theme.palette.primary[100] : theme.palette.primary[600],
         },
@@ -33,6 +25,12 @@ export default function ItemTable({ data, rowCanBeSelected }) {
             borderLeftStyle: "solid",
             borderColor: theme.palette.type === "light" ? theme.palette.grey[300] : theme.palette.grey[500]
         },
+        tableMargin: {
+            marginTop: theme.spacing(2)
+        },
+        tableHeaderMargin: {
+            marginBottom: theme.spacing(1)
+        }
     });
     const classes = useStyles();
 
@@ -73,18 +71,13 @@ export default function ItemTable({ data, rowCanBeSelected }) {
 
     return (
         <TableContainer>
-            <Table
-                {...getTableProps}
-                aria-label="Table of Queue Items"
-                size="small"
-                stickyHeader
-            >
+            <Table {...getTableProps} aria-label="Table of Queue Items" size="small" classes={{ root: classes.tableMargin }}>  
                 <TableHead>
                     {headerGroups.map(headerGroup => (
                         <TableRow {...headerGroup.getHeaderGroupProps()}>
                             {headerGroup.headers.map(column => (
                                 <Grid container spacing={1}>
-                                    <TableCell {...column.getHeaderProps()}>
+                                    <TableCell {...column.getHeaderProps()} classes={{ root: classes.tableHeaderMargin }}>
                                         <Grid container spacing={0}>
                                             <Grid item sm={10} >
                                                 {column.render("Filter")}
@@ -112,6 +105,7 @@ export default function ItemTable({ data, rowCanBeSelected }) {
                         </TableRow>
                     ))}
                 </TableHead>
+
                 <TableBody {...getTableBodyProps()}>
                     {rows.map((row, i) => {
                         prepareRow(row);
@@ -139,6 +133,7 @@ export default function ItemTable({ data, rowCanBeSelected }) {
                         );
                     })}
                 </TableBody>
+
             </Table>
         </TableContainer>
     );