Fix: Web design issues (#2377) (#2410)

* Fix web design issues

* Fix Right Nav width design issue

Co-authored-by: Rahul Yadav <52163880+rahulyadav5524@users.noreply.github.com>
zio/stable
Eric Bailey 2024-01-03 11:56:07 -06:00 committed by GitHub
parent df277e5977
commit 1b0c73a2a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 8 deletions

View File

@ -167,6 +167,7 @@ export const s = StyleSheet.create({
flexGrow1: {flexGrow: 1}, flexGrow1: {flexGrow: 1},
alignCenter: {alignItems: 'center'}, alignCenter: {alignItems: 'center'},
alignBaseline: {alignItems: 'baseline'}, alignBaseline: {alignItems: 'baseline'},
justifyCenter: {justifyContent: 'center'},
// position // position
absolute: {position: 'absolute'}, absolute: {position: 'absolute'},

View File

@ -229,7 +229,7 @@ export function FeedSourceCardLoaded({
</View> </View>
{showSaveBtn && feed.type === 'feed' && ( {showSaveBtn && feed.type === 'feed' && (
<View> <View style={[s.justifyCenter]}>
<Pressable <Pressable
testID={`feed-${feed.displayName}-toggleSave`} testID={`feed-${feed.displayName}-toggleSave`}
disabled={isSavePending || isPinPending || isRemovePending} disabled={isSavePending || isPinPending || isRemovePending}

View File

@ -62,7 +62,7 @@ export function ModerationScreen({}: Props) {
]} ]}
testID="moderationScreen"> testID="moderationScreen">
<ViewHeader title={_(msg`Moderation`)} showOnDesktop /> <ViewHeader title={_(msg`Moderation`)} showOnDesktop />
<ScrollView> <ScrollView contentContainerStyle={[styles.noBorder]}>
<View style={styles.spacer} /> <View style={styles.spacer} />
<TouchableOpacity <TouchableOpacity
testID="contentFilteringBtn" testID="contentFilteringBtn"
@ -275,4 +275,10 @@ const styles = StyleSheet.create({
borderRadius: 30, borderRadius: 30,
marginRight: 12, marginRight: 12,
}, },
noBorder: {
borderBottomWidth: 0,
borderRightWidth: 0,
borderLeftWidth: 0,
borderTopWidth: 0,
},
}) })

View File

@ -82,7 +82,7 @@ export function SavedFeeds({}: Props) {
isTabletOrDesktop && styles.desktopContainer, isTabletOrDesktop && styles.desktopContainer,
]}> ]}>
<ViewHeader title={_(msg`Edit My Feeds`)} showOnDesktop showBorder /> <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]}> <View style={[pal.text, pal.border, styles.title]}>
<Text type="title" style={pal.text}> <Text type="title" style={pal.text}>
<Trans>Pinned Feeds</Trans> <Trans>Pinned Feeds</Trans>
@ -288,7 +288,7 @@ function ListItem({
<FeedSourceCard <FeedSourceCard
key={feedUri} key={feedUri}
feedUri={feedUri} feedUri={feedUri}
style={styles.noBorder} style={styles.noTopBorder}
showSaveBtn showSaveBtn
showMinimalPlaceholder showMinimalPlaceholder
/> />
@ -344,7 +344,7 @@ const styles = StyleSheet.create({
webArrowUpButton: { webArrowUpButton: {
marginBottom: 10, marginBottom: 10,
}, },
noBorder: { noTopBorder: {
borderTopWidth: 0, borderTopWidth: 0,
}, },
footerText: { footerText: {
@ -352,4 +352,10 @@ const styles = StyleSheet.create({
paddingTop: 22, paddingTop: 22,
paddingBottom: 100, paddingBottom: 100,
}, },
noBorder: {
borderBottomWidth: 0,
borderRightWidth: 0,
borderLeftWidth: 0,
borderTopWidth: 0,
},
}) })

View File

@ -180,14 +180,14 @@ const styles = StyleSheet.create({
position: 'absolute', position: 'absolute',
// @ts-ignore web only // @ts-ignore web only
left: 'calc(50vw + 320px)', left: 'calc(50vw + 320px)',
width: 304, width: 300,
maxHeight: '100%', maxHeight: '100%',
overflowY: 'auto', overflowY: 'auto',
}, },
message: { message: {
paddingVertical: 18, paddingVertical: 18,
paddingHorizontal: 10, paddingHorizontal: 12,
}, },
messageLine: { messageLine: {
marginBottom: 10, marginBottom: 10,
@ -195,7 +195,7 @@ const styles = StyleSheet.create({
inviteCodes: { inviteCodes: {
borderTopWidth: 1, borderTopWidth: 1,
paddingHorizontal: 16, paddingHorizontal: 12,
paddingVertical: 12, paddingVertical: 12,
flexDirection: 'row', flexDirection: 'row',
}, },