Skip to content

Commit

Permalink
Merge branch 'main' of github.com:bluesky-social/social-app into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pfrazee committed Oct 29, 2024
2 parents 39381e6 + 5e947e5 commit 7942c68
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/screens/StarterPack/Wizard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
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 {useDialogControl} from '#/components/Dialog'
import * as Layout from '#/components/Layout'
Expand Down Expand Up @@ -121,7 +121,9 @@ export function Wizard({
}

return (
<Layout.Screen>
<Layout.Screen
testID="starterPackWizardScreen"
style={web([{minHeight: 0}, a.flex_1])}>
<Provider starterPack={starterPack} listItems={listItems}>
<WizardInner
currentStarterPack={starterPack}
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/composer/ExternalEmbedRemoveBtn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function ExternalEmbedRemoveBtn({onRemove}: {onRemove: () => void}) {
const {_} = useLingui()

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
label={_(msg`Remove attachment`)}
onPress={onRemove}
Expand Down
2 changes: 1 addition & 1 deletion src/view/com/composer/GifAltText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export function GifAltTextDialogLoaded({
onPress={control.open}
style={[
a.absolute,
{top: 20, left: 12},
{top: 8, left: 8},
{borderRadius: 6},
a.pl_xs,
a.pr_sm,
Expand Down

0 comments on commit 7942c68

Please sign in to comment.