Fix width handling for deactivated screen (#5810)

This commit is contained in:
Eric Bailey
2024-10-31 10:42:35 -05:00
committed by GitHub
parent 9a82d20bd9
commit 6f4703e814
3 changed files with 112 additions and 117 deletions
+1
View File
@@ -67,6 +67,7 @@
display: flex; display: flex;
flex: 1 0 auto; flex: 1 0 auto;
min-height: 100%; min-height: 100%;
width: 100%;
} }
#splash { #splash {
position: fixed; position: fixed;
+11 -18
View File
@@ -106,20 +106,23 @@ export function Deactivated() {
return ( return (
<View style={[a.util_screen_outer, a.flex_1, t.atoms.bg]}> <View style={[a.util_screen_outer, a.flex_1, t.atoms.bg]}>
<ScrollView <ScrollView
style={[a.h_full, a.w_full]}
contentContainerStyle={{borderWidth: 0}}>
<View
style={[ style={[
a.h_full,
a.w_full,
a.px_2xl, a.px_2xl,
{ {
paddingTop: isWeb ? 64 : insets.top + 16, paddingTop: isWeb ? 64 : insets.top + 16,
paddingBottom: isWeb ? 64 : insets.bottom, paddingBottom: isWeb ? 64 : insets.bottom,
}, },
]}
contentContainerStyle={[
a.w_full,
a.flex_row,
a.justify_center,
{borderWidth: 0},
]}> ]}>
<View style={[a.flex_row, a.justify_center]}>
<View style={[a.w_full, {maxWidth: COL_WIDTH}]}> <View style={[a.w_full, {maxWidth: COL_WIDTH}]}>
<View <View style={[a.w_full, a.justify_center, a.align_center, a.pb_5xl]}>
style={[a.w_full, a.justify_center, a.align_center, a.pb_5xl]}>
<Logo width={40} /> <Logo width={40} />
</View> </View>
@@ -186,11 +189,7 @@ export function Deactivated() {
{hasOtherAccounts ? ( {hasOtherAccounts ? (
<> <>
<Text <Text
style={[ style={[t.atoms.text_contrast_medium, a.pb_md, a.leading_snug]}>
t.atoms.text_contrast_medium,
a.pb_md,
a.leading_snug,
]}>
<Trans>Or, log into one of your other accounts.</Trans> <Trans>Or, log into one of your other accounts.</Trans>
</Text> </Text>
<AccountList <AccountList
@@ -203,11 +202,7 @@ export function Deactivated() {
) : ( ) : (
<> <>
<Text <Text
style={[ style={[t.atoms.text_contrast_medium, a.pb_md, a.leading_snug]}>
t.atoms.text_contrast_medium,
a.pb_md,
a.leading_snug,
]}>
<Trans>Or, continue with another account.</Trans> <Trans>Or, continue with another account.</Trans>
</Text> </Text>
<Button <Button
@@ -223,8 +218,6 @@ export function Deactivated() {
</> </>
)} )}
</View> </View>
</View>
</View>
</ScrollView> </ScrollView>
</View> </View>
) )
+1
View File
@@ -72,6 +72,7 @@
display: flex; display: flex;
flex: 1 0 auto; flex: 1 0 auto;
min-height: 100%; min-height: 100%;
width: 100%;
} }
#splash { #splash {
position: fixed; position: fixed;