diff --git a/src/view/com/profile/ProfileCard.tsx b/src/view/com/profile/ProfileCard.tsx index 2f93e59e..6a136a02 100644 --- a/src/view/com/profile/ProfileCard.tsx +++ b/src/view/com/profile/ProfileCard.tsx @@ -16,6 +16,7 @@ export function ProfileCard({ avatar, description, isFollowedBy, + noBorder, renderButton, }: { handle: string @@ -23,12 +24,18 @@ export function ProfileCard({ avatar?: string description?: string isFollowedBy?: boolean + noBorder?: boolean renderButton?: () => JSX.Element }) { const pal = usePalette('default') return ( @@ -42,7 +49,11 @@ export function ProfileCard({ /> - + {displayName || handle} @@ -154,6 +165,9 @@ const styles = StyleSheet.create({ borderTopWidth: 1, paddingHorizontal: 6, }, + outerNoBorder: { + borderTopWidth: 0, + }, layout: { flexDirection: 'row', alignItems: 'center', diff --git a/src/view/shell/web/DesktopHeader.tsx b/src/view/shell/web/DesktopHeader.tsx index 9fb22a7e..8748ebbd 100644 --- a/src/view/shell/web/DesktopHeader.tsx +++ b/src/view/shell/web/DesktopHeader.tsx @@ -203,29 +203,13 @@ const styles = StyleSheet.create({ borderRadius: 6, }, - search: { - flexDirection: 'row', - alignItems: 'center', - width: 300, - borderRadius: 20, - paddingVertical: 8, - paddingHorizontal: 10, - borderWidth: 1, - }, - searchIconWrapper: { - flexDirection: 'row', - width: 30, - justifyContent: 'center', - marginRight: 2, - }, - newPostBtn: { flexDirection: 'row', alignItems: 'center', justifyContent: 'center', borderRadius: 24, paddingTop: 8, - paddingBottom: 9, + paddingBottom: 8, paddingHorizontal: 18, backgroundColor: colors.blue3, }, diff --git a/src/view/shell/web/DesktopSearch.tsx b/src/view/shell/web/DesktopSearch.tsx index 8998219d..43f13ca2 100644 --- a/src/view/shell/web/DesktopSearch.tsx +++ b/src/view/shell/web/DesktopSearch.tsx @@ -34,132 +34,106 @@ export const DesktopSearch = observer(function DesktopSearch() { } return ( - - - - - setIsInputFocused(true)} - onBlur={() => setIsInputFocused(false)} - onChangeText={onChangeQuery} - /> - - {query ? ( - - - Cancel - - - ) : undefined} + + + + + setIsInputFocused(true)} + onBlur={() => setIsInputFocused(false)} + onChangeText={onChangeQuery} + /> + {query ? ( + + + Cancel + + + ) : undefined} + - - {query && autocompleteView.searchRes.length ? ( - <> - {autocompleteView.searchRes.map(item => ( - - ))} - - ) : query && !autocompleteView.searchRes.length ? ( - - - No results found for {autocompleteView.prefix} - - - ) : isInputFocused ? ( - - - Search for users on the network - - - ) : null} - + {query !== '' && ( + + {autocompleteView.searchRes.length ? ( + <> + {autocompleteView.searchRes.map((item, i) => ( + + ))} + + ) : ( + + + No results found for {autocompleteView.prefix} + + + )} + + )} ) }) const styles = StyleSheet.create({ container: { - flex: 1, + position: 'relative', + width: 300, }, search: { - maxWidth: 300, + paddingHorizontal: 10, + width: 300, borderRadius: 20, borderWidth: 1, }, - searchIconWrapper: { - flexDirection: 'row', - width: 30, - justifyContent: 'center', - marginRight: 2, - }, - searchInputWrapper: { + inputContainer: { flexDirection: 'row', }, - searchContainer: { - flexWrap: 'wrap', - position: 'relative', - paddingHorizontal: 12, - paddingTop: 6, - paddingBottom: 6, + iconWrapper: { + paddingVertical: 7, + marginRight: 4, }, - headerMenuBtn: { - width: 40, - height: 30, - marginLeft: 6, - }, - searchResultsContainer: { - position: 'fixed', + input: { flex: 1, - flexDirection: 'column', - borderRadius: 30, - paddingHorizontal: 12, - paddingVertical: 8, - marginTop: 50, - }, - headerSearchIcon: { - marginRight: 6, - alignSelf: 'center', - }, - headerSearchInput: { - flex: 1, - fontSize: 17, + fontSize: 16, width: '100%', + paddingTop: 7, + paddingBottom: 7, }, - headerCancelBtn: { - width: 60, + cancelBtn: { + paddingRight: 4, paddingLeft: 10, + paddingVertical: 7, }, - searchPrompt: { + resultsContainer: { + // @ts-ignore supported by web + position: 'fixed', + marginTop: 40, + + flexDirection: 'column', + width: 300, + borderWidth: 1, + borderRadius: 6, + paddingVertical: 4, + }, + noResults: { textAlign: 'center', - paddingTop: 10, + paddingVertical: 10, }, })