Merge branch 'main' of github.com:bluesky-social/social-app into main

This commit is contained in:
Paul Frazee
2024-10-28 17:21:24 -07:00
3 changed files with 6 additions and 4 deletions
+4 -2
View File
@@ -49,7 +49,7 @@ import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails' import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds' import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
import {StepProfiles} from '#/screens/StarterPack/Wizard/StepProfiles' import {StepProfiles} from '#/screens/StarterPack/Wizard/StepProfiles'
import {atoms as a, useTheme} from '#/alf' import {atoms as a, useTheme, web} from '#/alf'
import {Button, ButtonText} from '#/components/Button' import {Button, ButtonText} from '#/components/Button'
import {useDialogControl} from '#/components/Dialog' import {useDialogControl} from '#/components/Dialog'
import * as Layout from '#/components/Layout' import * as Layout from '#/components/Layout'
@@ -121,7 +121,9 @@ export function Wizard({
} }
return ( return (
<Layout.Screen> <Layout.Screen
testID="starterPackWizardScreen"
style={web([{minHeight: 0}, a.flex_1])}>
<Provider starterPack={starterPack} listItems={listItems}> <Provider starterPack={starterPack} listItems={listItems}>
<WizardInner <WizardInner
currentStarterPack={starterPack} currentStarterPack={starterPack}
@@ -11,7 +11,7 @@ export function ExternalEmbedRemoveBtn({onRemove}: {onRemove: () => void}) {
const {_} = useLingui() const {_} = useLingui()
return ( return (
<View style={[a.absolute, a.pt_sm, a.pr_sm, a.z_50, {top: 0, right: 0}]}> <View style={[a.absolute, {top: 8, right: 8}, a.z_50]}>
<Button <Button
label={_(msg`Remove attachment`)} label={_(msg`Remove attachment`)}
onPress={onRemove} onPress={onRemove}
+1 -1
View File
@@ -79,7 +79,7 @@ export function GifAltTextDialogLoaded({
onPress={control.open} onPress={control.open}
style={[ style={[
a.absolute, a.absolute,
{top: 20, left: 12}, {top: 8, left: 8},
{borderRadius: 6}, {borderRadius: 6},
a.pl_xs, a.pl_xs,
a.pr_sm, a.pr_sm,