Skip to content

Commit

Permalink
More fixes to back button pressing
Browse files Browse the repository at this point in the history
  • Loading branch information
tibetsprague committed Sep 4, 2024
1 parent 57607e8 commit 4150261
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ui/src/routes/account/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
<button class='text-4xl pr-5' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
</Header>

{#if $prof && $prof.status === 'complete' && $prof.value}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/contacts/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => goto('/create')}>
<button class='text-4xl pr-5' on:click={() => goto('/create')}>
<SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
</button>
</Header>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/contacts/new/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => goto('/create')}>
<button class='absolute z-10 text-4xl pr-5' on:click={() => goto('/create')}>
<SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
</button>
<h1 class="flex-1 text-center">{$t('contacts.create_new_contact')}</h1>
Expand Down
6 changes: 3 additions & 3 deletions ui/src/routes/conversations/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -236,18 +236,18 @@
</script>

<Header>
<a class='absolute pr-5' href="/conversations"><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
<a class='pr-5' href="/conversations"><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
{#if conversation}
<h1 class="flex-1 grow text-center">
<a href={`/conversations/${conversationId}/details`} class='flex flex-row items-center justify-center'>
<a href={`/conversations/${conversationId}/details`} class='pl-5 flex flex-row items-center justify-center'>
{conversation.title}
<button class='ml-2' on:click={() => goto(`/conversations/${conversationId}/details`)}>
<SvgIcon icon='gear' size='18' color={$modeCurrent ? '%232e2e2e' : 'white'} />
</button>
</a>
</h1>
{#if conversation.data.privacy === Privacy.Public || encodeHashToBase64(conversation.data.progenitor) === myPubKeyB64}
<a class='absolute right-5' href={`/conversations/${conversation.data.id}/${conversation.data.privacy === Privacy.Public ? 'details' : 'invite'}`}>
<a class='pl-5' href={`/conversations/${conversation.data.id}/${conversation.data.privacy === Privacy.Public ? 'details' : 'invite'}`}>
<SvgIcon icon='addPerson' size='24' color={$modeCurrent ? '%232e2e2e' : 'white'} />
</a>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/conversations/[id]/details/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</script>

<Header>
<a class='absolute pr-5' href={`/conversations/${conversationId}`}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
<a class='absolute pr-5 z-10' href={`/conversations/${conversationId}`}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></a>
{#if conversation}
<h1 class="flex-1 grow text-center">{#if conversation.data.privacy === Privacy.Public}{$t('conversations.group_details')}{:else}{conversation.title}{/if}</h1>
{#if conversation.data.privacy === Privacy.Private && encodeHashToBase64(conversation.data.progenitor) === relayStore.client.myPubKeyB64}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/conversations/[id]/invite/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => history.back()}>
<button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}>
<SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
</button>
<h1 class="flex-1 text-center">{$tAny('conversations.add_people', { public: conversation && conversation.data.privacy === Privacy.Public })}</h1>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/conversations/join/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
<button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
<h1 class="flex-1 text-center">{$t('conversations.join_conversation')}</h1>
</Header>

Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/conversations/new/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
<button class='text-4xl pr-5 absolute z-10' on:click={() => history.back()}><SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' /></button>
<h1 class="flex-1 text-center">{$t('common.new_group')}</h1>
</Header>

Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes/create/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</script>

<Header>
<button class='text-4xl pr-5 absolute' on:click={() => goto('/welcome')}>
<button class='text-4xl pr-5 absolute z-10' on:click={() => goto('/welcome')}>
<SvgIcon icon='caretLeft' color={$modeCurrent ? '%232e2e2e' : 'white'} size='10' />
</button>

Expand Down

0 comments on commit 4150261

Please sign in to comment.