fix iphone padding

This commit is contained in:
Marco Crapts
2023-06-01 21:31:18 +02:00
parent 2f4c4aa7fd
commit 8fe704744f
3 changed files with 38 additions and 8 deletions

View File

@@ -51,24 +51,35 @@ const submitPassphrase = (close: () => void) => {
if (passphraseValid.value) close() if (passphraseValid.value) close()
} }
const loading = computed(() => notes.value.length === 0 || passphraseRequired.value || !activeNotesSource.value) const loading = computed(
() => notes.value.length === 0 || passphraseRequired.value || !activeNotesSource.value
)
provide('loading', loading) provide('loading', loading)
const topBarHeight = 52
const topBarHeightWithSafeArea = computed(() => `calc(${topBarHeight}px + var(--safe-area-top))`)
</script> </script>
<template> <template>
<TopBar <TopBar
:side-bar-collapsed="sideBarCollapsed" :side-bar-collapsed="sideBarCollapsed"
:height="topBarHeight"
:style="{ height: topBarHeightWithSafeArea }"
@toggle-side-bar="sideBarCollapsed = !sideBarCollapsed" @toggle-side-bar="sideBarCollapsed = !sideBarCollapsed"
class="pe-[var(--safe-area-right)] ps-[var(--safe-area-left)]"
/> />
<!-- <div class="absolute bottom-0 left-0 right-0 top-[50px] mx-auto flex flex-grow"> --> <!-- <div class="absolute bottom-0 left-0 right-0 top-[50px] mx-auto flex flex-grow"> -->
<div class="mx-auto flex w-full max-w-app flex-grow"> <div
class="mx-auto flex w-full max-w-app flex-grow pe-[var(--safe-area-right)] ps-[var(--safe-area-left)]"
>
<Transition name="sidebar"> <Transition name="sidebar">
<SideBar <SideBar
:view-modes="viewModes" :view-modes="viewModes"
:active-view-mode="activeViewMode" :active-view-mode="activeViewMode"
@set-view-mode="(viewMode) => (activeViewMode = viewMode)" @set-view-mode="(viewMode) => (activeViewMode = viewMode)"
@collapse="(collapse) => (sideBarCollapsed = collapse)" @collapse="(collapse) => (sideBarCollapsed = collapse)"
class="mt-[50px] bg-gray-100 px-3 py-6 transition-[width] delay-200 duration-0 max-sm:z-50 max-sm:border-x-[1px] max-sm:py-3 max-sm:transition-transform max-sm:delay-0 max-sm:duration-200" class="bg-gray-100 px-3 py-6 transition-[width] delay-200 duration-0 max-sm:z-50 max-sm:border-x-[1px] max-sm:py-3 max-sm:transition-transform max-sm:delay-0 max-sm:duration-200"
:style="{ 'margin-top': topBarHeightWithSafeArea }"
v-if="!sideBarCollapsed" v-if="!sideBarCollapsed"
/> />
</Transition> </Transition>

View File

@@ -5,9 +5,15 @@ import { initialized } from '@/composables/useFirebase'
const loading = inject<boolean>('loading') const loading = inject<boolean>('loading')
const props = defineProps<{ const props = withDefaults(
sideBarCollapsed: boolean defineProps<{
}>() sideBarCollapsed: boolean
height?: number
}>(),
{
height: 52
}
)
const emit = defineEmits<{ const emit = defineEmits<{
toggleSideBar: [] toggleSideBar: []
@@ -24,8 +30,14 @@ const handleSignIn = async (close: () => Promise<boolean>) => {
} }
</script> </script>
<template> <template>
<div class="z-[500] flex h-[50px] bg-primary" :class="searchActive && 'search-active'"> <div
<div class="mx-auto flex w-full max-w-app items-center py-2.5 text-white"> class="z-[500] flex items-end bg-primary"
:class="searchActive && 'search-active'"
>
<div
class="mx-auto flex w-full max-w-app items-center py-2.5 text-white"
:style="{ height: `${props.height}px` }"
>
<div <div
class="search-active-hide flex items-center pl-3" class="search-active-hide flex items-center pl-3"
:class="sideBarCollapsed ? 'w-fit' : 'max-sm:w-fit md:w-sidebar md:pr-3'" :class="sideBarCollapsed ? 'w-fit' : 'max-sm:w-fit md:w-sidebar md:pr-3'"

View File

@@ -87,3 +87,10 @@ p:last-child {
@apply text-lg; @apply text-lg;
} }
} }
:root {
--safe-area-top: env(safe-area-inset-top);
--safe-area-right: env(safe-area-inset-right);
--safe-area-bottom: env(safe-area-inset-bottom);
--safe-area-left: env(safe-area-inset-left);
}