Browse Source

Merge branch 'refs/heads/master' into issue#199#202

# Conflicts:
#	src/routes/publication/+error.svelte
master
Nuša Pukšič 12 months ago
parent
commit
5eefea9a21
  1. 6
      src/lib/components/PublicationHeader.svelte
  2. 2
      src/routes/publication/+error.svelte

6
src/lib/components/PublicationHeader.svelte

@ -5,7 +5,6 @@
import { standardRelays } from '../consts'; import { standardRelays } from '../consts';
import { Card, Img } from "flowbite-svelte"; import { Card, Img } from "flowbite-svelte";
import CardActions from "$components/util/CardActions.svelte"; import CardActions from "$components/util/CardActions.svelte";
import Profile from "$components/util/Profile.svelte";
import InlineProfile from "$components/util/InlineProfile.svelte"; import InlineProfile from "$components/util/InlineProfile.svelte";
const { event } = $props<{ event: NDKEvent }>(); const { event } = $props<{ event: NDKEvent }>();
@ -55,11 +54,8 @@
{/if} {/if}
</a> </a>
</div> </div>
<div class="flex flex-col justify-between items-center"> <div class="flex flex-col justify-start items-center">
<CardActions event={event} /> <CardActions event={event} />
<div class="group mt-16">
<Profile pubkey={event.pubkey} />
</div>
</div> </div>
</div> </div>
</Card> </Card>

2
src/routes/publication/+error.svelte

@ -24,7 +24,7 @@
Try Again Try Again
</Button> </Button>
<Button class='btn-leather !w-fit' size='sm' outline onclick={() => goto('/')}> <Button class='btn-leather !w-fit' size='sm' outline onclick={() => goto('/')}>
Return to Home Return home
</Button> </Button>
</div> </div>
</Alert> </Alert>

Loading…
Cancel
Save