mirrors/elk
1
0
Fork 0
mirror of https://github.com/elk-zone/elk.git synced 2024-12-05 03:59:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into feat/guest

Browse source
This commit is contained in:
三咲智子 2023-01-07 03:39:21 +08:00
commit bdc045349c
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
layouts/default.vue
View file

@ -50,7 +50,7 @@ const showUserPicker = logicAnd(
</slot> </slot>
</div> </div>
</aside> </aside>
<div w-full min-h-screen :class="wideLayout ? 'xl:w-full sm:w-600px' : 'sm:w-600px md:shrink-0'" border-base> <div w-full min-h-screen :class="isHydrated && wideLayout ? 'xl:w-full sm:w-600px' : 'sm:w-600px md:shrink-0'" border-base>
<div min-h="[calc(100vh-3.5rem)]" sm:min-h-screen> <div min-h="[calc(100vh-3.5rem)]" sm:min-h-screen>
<slot /> <slot />
</div> </div>
@ -59,7 +59,7 @@ const showUserPicker = logicAnd(
<NavBottom v-if="isHydrated" /> <NavBottom v-if="isHydrated" />
</div> </div>
</div> </div>
<aside v-if="!wideLayout" class="hidden sm:none lg:block w-1/4 zen-hide"> <aside v-if="isHydrated && !wideLayout" class="hidden sm:none lg:block w-1/4 zen-hide">
<div sticky top-0 h-screen flex="~ col" gap-2 py3 ms-2> <div sticky top-0 h-screen flex="~ col" gap-2 py3 ms-2>
<slot name="right"> <slot name="right">
<div flex-auto /> <div flex-auto />

6
pages/settings/index.vue
View file

@ -1,9 +1,3 @@
<script setup>
definePageMeta({
wideLayout: true,
})
</script>
<template> <template>
<div min-h-screen flex justify-center items-center> <div min-h-screen flex justify-center items-center>
<div text-center flex="~ col gap-2" items-center> <div text-center flex="~ col gap-2" items-center>

5
service-worker/sw.ts
View file

@ -5,14 +5,11 @@ import { NavigationRoute, registerRoute } from 'workbox-routing'
import { CacheableResponsePlugin } from 'workbox-cacheable-response' import { CacheableResponsePlugin } from 'workbox-cacheable-response'
import { StaleWhileRevalidate } from 'workbox-strategies' import { StaleWhileRevalidate } from 'workbox-strategies'
import { ExpirationPlugin } from 'workbox-expiration' import { ExpirationPlugin } from 'workbox-expiration'
// import * as navigationPreload from 'workbox-navigation-preload'
import { onNotificationClick, onPush } from './web-push-notifications' import { onNotificationClick, onPush } from './web-push-notifications'
declare const self: ServiceWorkerGlobalScope declare const self: ServiceWorkerGlobalScope
// if (import.meta.env.PROD)
// navigationPreload.enable()
self.addEventListener('message', (event) => { self.addEventListener('message', (event) => {
if (event.data && event.data.type === 'SKIP_WAITING') if (event.data && event.data.type === 'SKIP_WAITING')
self.skipWaiting() self.skipWaiting()