diff options
author | Leon Jiang <35908040+leonyjiang@users.noreply.github.com> | 2021-03-08 21:00:39 -0500 |
---|---|---|
committer | Leon Jiang <35908040+leonyjiang@users.noreply.github.com> | 2021-03-08 21:00:39 -0500 |
commit | c6c0370bf1ddf052fbb56d32b9e21097950b8b16 (patch) | |
tree | 688f277f427592f905e018e78697dc56684b50b2 /src | |
parent | 3017d9a5cbf5ed525fc84a5f8062962c6377f6fe (diff) |
Fix styles messed up during merges
Diffstat (limited to 'src')
-rw-r--r-- | src/components/search/RecentSearches.tsx | 10 | ||||
-rw-r--r-- | src/components/search/SearchResultCell.tsx | 1 | ||||
-rw-r--r-- | src/components/search/SearchResultList.tsx | 1 | ||||
-rw-r--r-- | src/components/search/SearchResults.tsx | 1 | ||||
-rw-r--r-- | src/components/search/SearchResultsBackground.tsx | 1 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/components/search/RecentSearches.tsx b/src/components/search/RecentSearches.tsx index b4cc5483..84d35cac 100644 --- a/src/components/search/RecentSearches.tsx +++ b/src/components/search/RecentSearches.tsx @@ -25,12 +25,7 @@ interface RecentSearchesProps extends TouchableOpacityProps { } const RecentSearches: React.FC<RecentSearchesProps> = (props) => { - const { - sectionTitle, - recents, - recentCategories, - screenType, - } = props; + const {sectionTitle, recents, recentCategories, screenType} = props; return ( <ScrollView style={styles.mainContainer} @@ -53,10 +48,11 @@ const RecentSearches: React.FC<RecentSearchesProps> = (props) => { const styles = StyleSheet.create({ mainContainer: { - flexGrow: 1, + flex: 1, }, contentContainer: { paddingBottom: SCREEN_HEIGHT * 0.1, + flex: 1, }, header: { paddingHorizontal: 25, diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index e0351d96..5e6bb026 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -169,6 +169,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', paddingHorizontal: 25, paddingVertical: 15, + backgroundColor: 'pink', }, imageContainer: { width: SCREEN_WIDTH * 0.112, diff --git a/src/components/search/SearchResultList.tsx b/src/components/search/SearchResultList.tsx index f6e26820..41c8c8b2 100644 --- a/src/components/search/SearchResultList.tsx +++ b/src/components/search/SearchResultList.tsx @@ -70,7 +70,6 @@ const SearchResultList: React.FC<SearchResultsProps> = ({ const styles = StyleSheet.create({ container: { - paddingTop: 25, height: SCREEN_HEIGHT, }, sectionHeaderStyle: { diff --git a/src/components/search/SearchResults.tsx b/src/components/search/SearchResults.tsx index 798d3251..f9de8927 100644 --- a/src/components/search/SearchResults.tsx +++ b/src/components/search/SearchResults.tsx @@ -10,6 +10,7 @@ import {StyleSheet, View} from 'react-native'; import SearchResultsCell from './SearchResultCell'; import {useSelector} from 'react-redux'; import {RootState} from 'src/store/rootReducer'; +import {SCREEN_WIDTH} from '../../utils'; interface SearchResultsProps { results: ProfilePreviewType[]; previewType: PreviewType; diff --git a/src/components/search/SearchResultsBackground.tsx b/src/components/search/SearchResultsBackground.tsx index 7c1244fe..2833553d 100644 --- a/src/components/search/SearchResultsBackground.tsx +++ b/src/components/search/SearchResultsBackground.tsx @@ -37,6 +37,7 @@ const styles = StyleSheet.create({ }, contentContainer: { flex: 1, + paddingVertical: 10, paddingBottom: SCREEN_HEIGHT / 15, }, }); |