Merge pull request #119 from zetkin:issue-79/publishing-button

Change pull request button to publishing button
zetkin · Jul 28, 2024 · a915370 · a915370
2 parents 1ac8bbf + d3d1c46
commit a915370
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/webapp/src/app/projects/[projectName]/[languageName]/page.tsx b/webapp/src/app/projects/[projectName]/[languageName]/page.tsx
@@ -69,13 +69,13 @@ const MessagesPage: NextPage<{
         />
         <Sidebar>
           <TitleBar languageName={languageName} projectName={projectName} />
-          <PullRequestButton projectName={projectName} />
           <MessageTree
             languageName={languageName}
             messageId={messageId}
             messages={messages}
             projectName={projectName}
           />
+          <PullRequestButton projectName={projectName} />
         </Sidebar>
       </SidebarContextProvider>
       <Main>

diff --git a/webapp/src/components/MessageTree.tsx b/webapp/src/components/MessageTree.tsx
@@ -81,6 +81,7 @@ const MessageTree: FC<MessageTreeProps> = ({
       items={tree}
       onItemSelectionToggle={onItemSelectionToggle}
       slots={{ item: TreeItem2 }}
+      sx={{ overflowY: 'auto' }}
     />
   );
 };

diff --git a/webapp/src/components/PullRequestButton.tsx b/webapp/src/components/PullRequestButton.tsx
@@ -36,10 +36,12 @@ const PullRequestButton: FC<PullRequestButtonProps> = ({ projectName }) => {
   return (
     <>
       <Box
+        p={2}
         style={{
           alignContent: 'center',
+          borderTop: '1px solid #c3c7cc',
           display: 'flex',
-          height: 40,
+          height: 64,
           justifyContent: 'center',
         }}
       >
@@ -52,7 +54,7 @@ const PullRequestButton: FC<PullRequestButtonProps> = ({ projectName }) => {
             type="submit"
             variant="contained"
           >
-            Pull Request
+            Publish changes
           </Button>
         )}
         {state.pullRequestStatus === 'sending' && (

diff --git a/webapp/src/components/Sidebar.tsx b/webapp/src/components/Sidebar.tsx
@@ -84,9 +84,7 @@ const Sidebar: FC<SidebarProps> = ({ children }) => {
           sx={{
             display: 'flex',
             flexDirection: 'column',
-            overflowY: 'auto',
-            p: 2,
-            rowGap: theme.spacing(2),
+            overflow: 'hidden',
           }}
         >
           {children}

diff --git a/webapp/src/components/TitleBar.tsx b/webapp/src/components/TitleBar.tsx
@@ -15,13 +15,13 @@ const TitleBar: FC<TitleBarProps> = ({ languageName, projectName }) => {
   const theme = useTheme();
   return (
     <Box
+      px={2}
+      py={2}
       sx={{
         alignItems: 'center',
         borderBottom: '1px solid #c3c7cc',
         columnGap: theme.spacing(1),
         display: 'flex',
-        paddingBottom: theme.spacing(2),
-        paddingTop: theme.spacing(1),
       }}
     >
       <Link