Browse Source

adjust spacing

ruiyi.jiang 2 years ago
parent
commit
c4f2d6510d

+ 0 - 1
client/src/components/grid/Grid.tsx

@@ -175,7 +175,6 @@ const AttuGrid: FC<AttuGridType> = props => {
     <Grid
     <Grid
       container
       container
       classes={{ root: classes.wrapper, container: classes.container }}
       classes={{ root: classes.wrapper, container: classes.container }}
-      spacing={3}
     >
     >
       {title && (
       {title && (
         <Grid item xs={12} className={classes.tableTitle}>
         <Grid item xs={12} className={classes.tableTitle}>

+ 4 - 1
client/src/components/grid/ToolBar.tsx

@@ -33,6 +33,9 @@ const useStyles = makeStyles((theme: Theme) =>
       justifyContent: 'flex-end',
       justifyContent: 'flex-end',
       alignItems: 'center',
       alignItems: 'center',
     },
     },
+    toolbar: {
+      marginBottom: theme.spacing(2),
+    },
   })
   })
 );
 );
 
 
@@ -59,7 +62,7 @@ const CustomToolBar: FC<ToolBarType> = props => {
 
 
   return (
   return (
     <>
     <>
-      <Grid container role="toolbar">
+      <Grid container role="toolbar" className={classes.toolbar}>
         <Grid item xs={8}>
         <Grid item xs={8}>
           {leftConfigs.map((c, i) => {
           {leftConfigs.map((c, i) => {
             const isSelect = c.type === 'select' || c.type === 'groupSelect';
             const isSelect = c.type === 'select' || c.type === 'groupSelect';

+ 1 - 1
client/src/components/layout/Header.tsx

@@ -22,7 +22,7 @@ const useStyles = makeStyles((theme: Theme) =>
       justifyContent: 'space-between',
       justifyContent: 'space-between',
       alignItems: 'center',
       alignItems: 'center',
       paddingTop: theme.spacing(3),
       paddingTop: theme.spacing(3),
-      paddingLeft: theme.spacing(6),
+      paddingLeft: theme.spacing(5),
       flex: 1,
       flex: 1,
     },
     },
     navigation: {
     navigation: {

+ 1 - 1
client/src/styles/common.css

@@ -33,7 +33,7 @@ fieldset {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
 
 
-  margin: 16px 40px;
+  margin: 16px 32px 32px;
 }
 }
 
 
 .page-empty-card {
 .page-empty-card {