diff options
author | Ivan Chen <ivan@tagg.id> | 2021-02-18 14:09:00 -0500 |
---|---|---|
committer | Ivan Chen <ivan@tagg.id> | 2021-02-18 14:09:00 -0500 |
commit | c158b835a1f6cedd1448c2beb1389324a3c9e48a (patch) | |
tree | accfce9584f6a2953fa4821368b0df36514cb49a /src/components/taggs | |
parent | 200cc2cc2c37d588bc37240161c3974f63ce02b4 (diff) | |
parent | 99db144ce20fd5f1502f668795ae7cafbc5b2eae (diff) |
Merge branch 'master' into tma626-people-tutorial
# Conflicts:
# src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
Diffstat (limited to 'src/components/taggs')
-rw-r--r-- | src/components/taggs/Tagg.tsx | 13 | ||||
-rw-r--r-- | src/components/taggs/TaggsBar.tsx | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx index bb450b64..66694132 100644 --- a/src/components/taggs/Tagg.tsx +++ b/src/components/taggs/Tagg.tsx @@ -141,7 +141,12 @@ const Tagg: React.FC<TaggProps> = ({ setModalVisible={setModalVisible} completionCallback={linkNonIntegratedSocial} /> - <View style={styles.container}> + <View + style={ + screenType === ScreenType.SuggestedPeople + ? styles.spcontainer + : styles.container + }> <TouchableOpacity style={styles.iconTap} onPress={modalOrAuthBrowserOrPass}> @@ -174,6 +179,12 @@ const Tagg: React.FC<TaggProps> = ({ }; const styles = StyleSheet.create({ + spcontainer: { + justifyContent: 'space-between', + alignItems: 'center', + marginRight: 34, + height: normalize(60), + }, container: { justifyContent: 'space-between', alignItems: 'center', diff --git a/src/components/taggs/TaggsBar.tsx b/src/components/taggs/TaggsBar.tsx index e7bdb0f2..c23f56a9 100644 --- a/src/components/taggs/TaggsBar.tsx +++ b/src/components/taggs/TaggsBar.tsx @@ -148,7 +148,7 @@ const styles = StyleSheet.create({ shadowRadius: 10, shadowOffset: {width: 0, height: 2}, zIndex: 1, - paddingBottom: 5, + marginBottom: 25, }, container: { backgroundColor: 'white', |