Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tab bar safe margins on ios #538

Merged
merged 3 commits into from
Nov 29, 2024
Merged

fix: tab bar safe margins on ios #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6241bb4
fix: tab bar safe margins on ios
phoebus-84 Nov 29, 2024
e5d7980
fix: some fix to ios scanner
phoebus-84 Nov 29, 2024
efd612c
Merge branch 'main' into fix_ios_safe_area
phoebus-84 Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/lib/components/molecules/Modal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<ion-modal is-open={isModalOpen} backdrop-dismiss={false} transition:fly class="visible">
<hr />
<ion-content class="ion-padding visible">
<ion-header>
<ion-toolbar>
<ion-title>{m.Results()}</ion-title>
<ion-buttons slot="end">
Expand All @@ -44,7 +44,10 @@
<CopyButton {textToCopy} delay={1000} />
{/if}
</ion-buttons>
</ion-toolbar>
</ion-toolbar>
</ion-header>
<ion-content class="ion-padding visible">

<d-vertical-stack class="mt-4">
<slot />
</d-vertical-stack>
Expand Down
8 changes: 5 additions & 3 deletions src/lib/components/organisms/scanner/Scanner.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
{ signal };
});
onDestroy(() => {
document.querySelector('body')?.classList.remove('barcode-scanner-active');
controller.abort();
});

Expand All @@ -106,9 +107,9 @@
};
</script>

<ion-header class="visible z-50">
<ion-toolbar>
<ion-title class="pl-14 text-center uppercase">
<ion-header class="visible z-50" translucent>
<ion-toolbar >
<ion-title class="pl-14 text-center uppercase dark:bg-[#253151] bg-[#e9ebef]">
{m.QR_SCAN()}
</ion-title>
<ion-buttons slot="end">
Expand All @@ -120,6 +121,7 @@
</ion-header>

<ion-content>

{#if !isWeb}
{#await awaitPermissions()}
<div class="flex h-full w-full items-center justify-center">
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/IonTabs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ion-tabs>
<slot />
{#key currentTabName}
<ion-tab-bar slot="bottom" class="ion-padding flex min-h-12 justify-between py-0">
<ion-tab-bar slot="bottom" class="flex justify-between px-4">
{#each tabs as tabObj}
{@const { tab, hasAlert, label } = tabObj}
<d-tab-button
Expand Down
Loading