Merge branch 'master' into TMA-546-Onboarding-Page

1 files changed, 19 insertions, 16 deletions

diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx
index 6284ff59..1ee3ae2b 100644
--- a/src/components/profile/ProfileBody.tsx
+++ b/src/components/profile/ProfileBody.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {StyleSheet, View, Text, LayoutChangeEvent, Linking} from 'react-native';
-import {Button} from 'react-native-elements';
+import {Button, normalize} from 'react-native-elements';
 import {
   TAGG_DARK_BLUE,
-  TAGG_TEXT_LIGHT_BLUE,
+  TAGG_LIGHT_BLUE,
   TOGGLE_BUTTON_TYPE,
 } from '../../constants';
 import ToggleButton from './ToggleButton';
@@ -105,8 +105,8 @@ const ProfileBody: React.FC<ProfileBodyProps> = ({
           {friendship_status === 'friends' && (
             <Button
               title={'Unfriend'}
-              buttonStyle={styles.button}
-              titleStyle={styles.buttonTitle}
+              buttonStyle={styles.requestedButton}
+              titleStyle={styles.requestedButtonTitle}
               onPress={handleFriendUnfriend} // unfriend, no record status
             />
           )}
@@ -160,16 +160,15 @@ const styles = StyleSheet.create({
   },
   username: {
     fontWeight: '600',
-    fontSize: 16.5,
+    fontSize: normalize(12),
     marginBottom: '1%',
-    marginTop: '-3%',
   },
   biography: {
-    fontSize: 16,
+    fontSize: normalize(12),
     marginBottom: '1.5%',
   },
   website: {
-    fontSize: 16,
+    fontSize: normalize(12),
     color: TAGG_DARK_BLUE,
     marginBottom: '1%',
   },
@@ -177,16 +176,17 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     width: SCREEN_WIDTH * 0.4,
-    height: SCREEN_WIDTH * 0.09,
-    borderColor: TAGG_TEXT_LIGHT_BLUE,
-    borderWidth: 3,
-    borderRadius: 5,
+    height: SCREEN_WIDTH * 0.075,
+    borderColor: TAGG_LIGHT_BLUE,
+    borderWidth: 2,
+    borderRadius: 0,
     marginRight: '2%',
+    marginLeft: '1%',
     padding: 0,
     backgroundColor: 'transparent',
   },
   requestedButtonTitle: {
-    color: TAGG_TEXT_LIGHT_BLUE,
+    color: TAGG_LIGHT_BLUE,
     padding: 0,
     fontSize: 14,
     fontWeight: '700',
@@ -201,11 +201,14 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     width: SCREEN_WIDTH * 0.4,
-    height: SCREEN_WIDTH * 0.09,
+    height: SCREEN_WIDTH * 0.075,
     padding: 0,
-    borderRadius: 5,
+    borderWidth: 2,
+    borderColor: TAGG_LIGHT_BLUE,
+    borderRadius: 0,
     marginRight: '2%',
-    backgroundColor: TAGG_TEXT_LIGHT_BLUE,
+    marginLeft: '1%',
+    backgroundColor: TAGG_LIGHT_BLUE,
   },
 });