diff options
author | Eric Bailey <git@esb.lol> | 2024-01-03 11:56:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-03 09:56:07 -0800 |
commit | 1b0c73a2a392fb4aa2e116d00c96744aa20ce0e7 (patch) | |
tree | 73d869763b15784942cef8b77a38ccd65ea0e209 /src | |
parent | df277e5977cb0b1f7e11c7e94265029f8e37ece4 (diff) | |
download | voidsky-1b0c73a2a392fb4aa2e116d00c96744aa20ce0e7.tar.zst |
* Fix web design issues * Fix Right Nav width design issue Co-authored-by: Rahul Yadav <52163880+rahulyadav5524@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/styles.ts | 1 | ||||
-rw-r--r-- | src/view/com/feeds/FeedSourceCard.tsx | 2 | ||||
-rw-r--r-- | src/view/screens/Moderation.tsx | 8 | ||||
-rw-r--r-- | src/view/screens/SavedFeeds.tsx | 12 | ||||
-rw-r--r-- | src/view/shell/desktop/RightNav.tsx | 6 |
5 files changed, 21 insertions, 8 deletions
diff --git a/src/lib/styles.ts b/src/lib/styles.ts index 152e60eb0..5a10fea86 100644 --- a/src/lib/styles.ts +++ b/src/lib/styles.ts @@ -167,6 +167,7 @@ export const s = StyleSheet.create({ flexGrow1: {flexGrow: 1}, alignCenter: {alignItems: 'center'}, alignBaseline: {alignItems: 'baseline'}, + justifyCenter: {justifyContent: 'center'}, // position absolute: {position: 'absolute'}, diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx index 99e2b474f..338ffc3d0 100644 --- a/src/view/com/feeds/FeedSourceCard.tsx +++ b/src/view/com/feeds/FeedSourceCard.tsx @@ -229,7 +229,7 @@ export function FeedSourceCardLoaded({ </View> {showSaveBtn && feed.type === 'feed' && ( - <View> + <View style={[s.justifyCenter]}> <Pressable testID={`feed-${feed.displayName}-toggleSave`} disabled={isSavePending || isPinPending || isRemovePending} diff --git a/src/view/screens/Moderation.tsx b/src/view/screens/Moderation.tsx index 1bf8db2e0..96bb46cef 100644 --- a/src/view/screens/Moderation.tsx +++ b/src/view/screens/Moderation.tsx @@ -62,7 +62,7 @@ export function ModerationScreen({}: Props) { ]} testID="moderationScreen"> <ViewHeader title={_(msg`Moderation`)} showOnDesktop /> - <ScrollView> + <ScrollView contentContainerStyle={[styles.noBorder]}> <View style={styles.spacer} /> <TouchableOpacity testID="contentFilteringBtn" @@ -275,4 +275,10 @@ const styles = StyleSheet.create({ borderRadius: 30, marginRight: 12, }, + noBorder: { + borderBottomWidth: 0, + borderRightWidth: 0, + borderLeftWidth: 0, + borderTopWidth: 0, + }, }) diff --git a/src/view/screens/SavedFeeds.tsx b/src/view/screens/SavedFeeds.tsx index bbac30689..8a16ffdf2 100644 --- a/src/view/screens/SavedFeeds.tsx +++ b/src/view/screens/SavedFeeds.tsx @@ -82,7 +82,7 @@ export function SavedFeeds({}: Props) { isTabletOrDesktop && styles.desktopContainer, ]}> <ViewHeader title={_(msg`Edit My Feeds`)} showOnDesktop showBorder /> - <ScrollView style={s.flex1}> + <ScrollView style={s.flex1} contentContainerStyle={[styles.noBorder]}> <View style={[pal.text, pal.border, styles.title]}> <Text type="title" style={pal.text}> <Trans>Pinned Feeds</Trans> @@ -288,7 +288,7 @@ function ListItem({ <FeedSourceCard key={feedUri} feedUri={feedUri} - style={styles.noBorder} + style={styles.noTopBorder} showSaveBtn showMinimalPlaceholder /> @@ -344,7 +344,7 @@ const styles = StyleSheet.create({ webArrowUpButton: { marginBottom: 10, }, - noBorder: { + noTopBorder: { borderTopWidth: 0, }, footerText: { @@ -352,4 +352,10 @@ const styles = StyleSheet.create({ paddingTop: 22, paddingBottom: 100, }, + noBorder: { + borderBottomWidth: 0, + borderRightWidth: 0, + borderLeftWidth: 0, + borderTopWidth: 0, + }, }) diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 02b742dc9..894624a6e 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -180,14 +180,14 @@ const styles = StyleSheet.create({ position: 'absolute', // @ts-ignore web only left: 'calc(50vw + 320px)', - width: 304, + width: 300, maxHeight: '100%', overflowY: 'auto', }, message: { paddingVertical: 18, - paddingHorizontal: 10, + paddingHorizontal: 12, }, messageLine: { marginBottom: 10, @@ -195,7 +195,7 @@ const styles = StyleSheet.create({ inviteCodes: { borderTopWidth: 1, - paddingHorizontal: 16, + paddingHorizontal: 12, paddingVertical: 12, flexDirection: 'row', }, |