From 966daa3050f38677a9bd69da32a681cd15383c6f Mon Sep 17 00:00:00 2001
From: Nicholas Lee <niconal902@gmail.com>
Date: Tue, 1 Oct 2024 10:16:17 -0400
Subject: [PATCH] fix: merge conflicts

---
 .../neurosynth-frontend/src/pages/Project/ProjectPage.tsx | 2 +-
 .../neurosynth-frontend/src/pages/Study/EditStudyPage.tsx | 6 ------
 .../src/pages/Study/components/EditStudyToolbar.tsx       | 8 +++++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx b/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx
index 1a0ae5a5..89d73514 100644
--- a/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx
+++ b/compose/neurosynth-frontend/src/pages/Project/ProjectPage.tsx
@@ -168,7 +168,7 @@ const ProjectPage: React.FC = (props) => {
                                 borderTopRightRadius: '6px',
                                 borderColor: 'lightgray',
                                 borderBottomColor: 'white',
-                                marginBottom: '-1px',
+                                marginBottom: '-2px',
                             },
                             '.MuibuttonBase-root': {},
                             transition: 'none',
diff --git a/compose/neurosynth-frontend/src/pages/Study/EditStudyPage.tsx b/compose/neurosynth-frontend/src/pages/Study/EditStudyPage.tsx
index 87e3f735..5bc3a522 100644
--- a/compose/neurosynth-frontend/src/pages/Study/EditStudyPage.tsx
+++ b/compose/neurosynth-frontend/src/pages/Study/EditStudyPage.tsx
@@ -97,9 +97,6 @@ const EditStudyPage: React.FC = (props) => {
                             >
                                 Giant Panda Identification
                             </Typography>
-                            <Typography textAlign="start" fontSize="0.6rem">
-                                Back
-                            </Typography>
                         </Box>
                     </Button>
                     <Typography variant="body2" sx={{ marginX: '1rem' }}>
@@ -129,9 +126,6 @@ const EditStudyPage: React.FC = (props) => {
                                 Reproducibility of fMRI results across four institutions using a
                                 spatial workign memory task
                             </Typography>
-                            <Typography textAlign="end" fontSize="0.6rem">
-                                Next
-                            </Typography>
                         </Box>
                     </Button>
                 </Box>
diff --git a/compose/neurosynth-frontend/src/pages/Study/components/EditStudyToolbar.tsx b/compose/neurosynth-frontend/src/pages/Study/components/EditStudyToolbar.tsx
index 5e2a1be4..e623780d 100644
--- a/compose/neurosynth-frontend/src/pages/Study/components/EditStudyToolbar.tsx
+++ b/compose/neurosynth-frontend/src/pages/Study/components/EditStudyToolbar.tsx
@@ -31,6 +31,7 @@ import { useStudyId } from 'pages/Study/store/StudyStore';
 import { useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import EditStudyToolbarStyles from './EditStudyToolbar.styles';
+import SaveIcon from '@mui/icons-material/Save';
 
 const EditStudyToolbar: React.FC<{ isViewOnly?: boolean }> = ({ isViewOnly = false }) => {
     const navigate = useNavigate();
@@ -201,7 +202,7 @@ const EditStudyToolbar: React.FC<{ isViewOnly?: boolean }> = ({ isViewOnly = fal
                                 <SwapHorizIcon />
                             </Fab>
                         </Box>
-                        <Box>
+                        <Box sx={{ marginBottom: '1rem' }}>
                             <ButtonGroup orientation="vertical">
                                 <Button
                                     onClick={() =>
@@ -233,6 +234,11 @@ const EditStudyToolbar: React.FC<{ isViewOnly?: boolean }> = ({ isViewOnly = fal
                                 </Button>
                             </ButtonGroup>
                         </Box>
+                        <Box sx={{ marginBottom: '1rem' }}>
+                            <Fab color="success" size="small" sx={{ boxShadow: 'none' }}>
+                                <SaveIcon />
+                            </Fab>
+                        </Box>
 
                         {/* <Box sx={{ marginBottom: '1rem' }}>
                                 <Tooltip placement="right" title="move to completed">