From a3132c7423e16cb2379d1a2c06c765323f326c1a Mon Sep 17 00:00:00 2001
From: RohitGarudadri <rohit.garudadri@mail.mcgill.ca>
Date: Sat, 21 Dec 2019 16:16:16 -0500
Subject: [PATCH 1/4] fixed label spacing between view resume and upload resume

---
 docs/CHANGELOG.md                            | 1 +
 src/features/Application/ResumeComponent.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a4d2e5cd0..40a175399 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Button spacing on application page
+- Label spacing between view resume and upload resume while editing application
 
 ## [2.0.0](https://github.com/hackmcgill/dashboard/tree/2.0.0) - 2019-12-17
 
diff --git a/src/features/Application/ResumeComponent.tsx b/src/features/Application/ResumeComponent.tsx
index 109817da3..66b9fc56f 100644
--- a/src/features/Application/ResumeComponent.tsx
+++ b/src/features/Application/ResumeComponent.tsx
@@ -19,7 +19,7 @@ const ResumeComponent: React.StatelessComponent<IResumeProps & FieldProps> = (
   return (
     <Flex mb={'20px'}>
       <Box>{props.mode === ManageApplicationModes.EDIT && viewResume}</Box>
-      <Box>
+      <Box ml={'10px'}>
         <Label>
           <LabelText label={props.label} required={props.required} />
           <FileUpload {...props} />

From f96a7717b5c3e63e8830e79c84646168379b2857 Mon Sep 17 00:00:00 2001
From: RohitGarudadri <rohit.garudadri@mail.mcgill.ca>
Date: Sun, 22 Dec 2019 14:25:22 -0500
Subject: [PATCH 2/4] Fixed button spacing and placed view resume on right side

---
 src/features/Application/ResumeComponent.tsx | 8 +++++---
 src/shared/Elements/Button.tsx               | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/features/Application/ResumeComponent.tsx b/src/features/Application/ResumeComponent.tsx
index 66b9fc56f..22a7a340b 100644
--- a/src/features/Application/ResumeComponent.tsx
+++ b/src/features/Application/ResumeComponent.tsx
@@ -18,13 +18,15 @@ const ResumeComponent: React.StatelessComponent<IResumeProps & FieldProps> = (
   const viewResume = <ViewPDFComponent {...props} />;
   return (
     <Flex mb={'20px'}>
-      <Box>{props.mode === ManageApplicationModes.EDIT && viewResume}</Box>
-      <Box ml={'10px'}>
+      <Box>
         <Label>
           <LabelText label={props.label} required={props.required} />
-          <FileUpload {...props} />
+          <div style={{ marginLeft: '-10px' }}>
+            <FileUpload {...props} />
+          </div>
         </Label>
       </Box>
+      <Box>{props.mode === ManageApplicationModes.EDIT && viewResume}</Box>
     </Flex>
   );
 };
diff --git a/src/shared/Elements/Button.tsx b/src/shared/Elements/Button.tsx
index 3059ed1fd..bd2c2e85f 100644
--- a/src/shared/Elements/Button.tsx
+++ b/src/shared/Elements/Button.tsx
@@ -39,7 +39,9 @@ export const Button = styled.button<IButtonProps>`
       font-size: 16px;
       font-weight: 400;
       text-transform: capitalize;
-      height: 40px;
+      min-height: 40px;
+      max-height: 60px;
+
 
       /* Default border radius to values befiting a call to action button 
          - these values will be reset later if button is not a call to action */

From 31f85dc8c132ee62df8fa1ff8a844ab6b77d91a8 Mon Sep 17 00:00:00 2001
From: RohitGarudadri <rohit.garudadri@mail.mcgill.ca>
Date: Sun, 22 Dec 2019 15:29:35 -0500
Subject: [PATCH 3/4] Label spacing fixed

---
 src/features/Application/ResumeComponent.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/Application/ResumeComponent.tsx b/src/features/Application/ResumeComponent.tsx
index 22a7a340b..21d5a53a6 100644
--- a/src/features/Application/ResumeComponent.tsx
+++ b/src/features/Application/ResumeComponent.tsx
@@ -18,7 +18,8 @@ const ResumeComponent: React.StatelessComponent<IResumeProps & FieldProps> = (
   const viewResume = <ViewPDFComponent {...props} />;
   return (
     <Flex mb={'20px'}>
-      <Box>
+      <Box>{props.mode === ManageApplicationModes.EDIT && viewResume}</Box>
+      <Box ml={props.mode === ManageApplicationModes.EDIT ? '10px' : ''}>
         <Label>
           <LabelText label={props.label} required={props.required} />
           <div style={{ marginLeft: '-10px' }}>
@@ -26,7 +27,6 @@ const ResumeComponent: React.StatelessComponent<IResumeProps & FieldProps> = (
           </div>
         </Label>
       </Box>
-      <Box>{props.mode === ManageApplicationModes.EDIT && viewResume}</Box>
     </Flex>
   );
 };

From fd368c492140db1736bd3994facab51b7fb19c04 Mon Sep 17 00:00:00 2001
From: RohitGarudadri <rohit.garudadri@mail.mcgill.ca>
Date: Mon, 23 Dec 2019 01:01:07 -0500
Subject: [PATCH 4/4] fix changelog

---
 docs/CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d566e518a..ac9607135 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -19,13 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Button spacing on application page
-<<<<<<< HEAD
 - Label spacing between view resume and upload resume while editing application
-=======
 - Checkmark not aligning with checkbox on smaller screens
 - Checkmark appearing on dropdown lists due to z-index
 - Job interest dropdown colours
->>>>>>> develop
 
 ### Removed