diff --git a/composables/pwa/index.ts b/composables/pwa/index.ts index 09878d11..30cfc77e 100644 --- a/composables/pwa/index.ts +++ b/composables/pwa/index.ts @@ -3,6 +3,10 @@ import { useRegisterSW } from 'virtual:pwa-register/vue' export const usePWA = () => { const online = useOnline() + useHead({ + meta: [{ id: 'theme-color', name: 'theme-color', content: computed(() => isDark.value ? '#111111' : '#ffffff') }], + }) + const { needRefresh, updateServiceWorker, diff --git a/config/pwa.ts b/config/pwa.ts index b159d14b..2a595c5e 100644 --- a/config/pwa.ts +++ b/config/pwa.ts @@ -31,12 +31,14 @@ const pwa: VitePWANuxtOptions = { sizes: '512x512', type: 'image/png', }, + /* { src: 'logo.svg', sizes: '250x250', type: 'image/png', purpose: 'any maskable', }, +*/ ], }, injectManifest: { diff --git a/nuxt.config.ts b/nuxt.config.ts index 28b6c1dc..408d5d40 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -4,7 +4,7 @@ import { isCI, isDevelopment } from 'std-env' import { i18n } from './config/i18n' import { pwa } from './config/pwa' -const isPreview = process.env.PULL_REQUEST === 'true' +const isPreview = process.env.PULL_REQUEST === 'true' || process.env.CONTEXT === 'deploy-preview' || process.env.CONTEXT === 'dev' export default defineNuxtConfig({ typescript: { @@ -110,14 +110,10 @@ export default defineNuxtConfig({ class: 'overflow-x-hidden', }, link: [ - { rel: 'icon', type: 'image/png', href: '/favicon.png' }, - { rel: 'alternate icon', type: 'image/x-icon', href: '/favicon.ico' }, - { rel: 'icon', type: 'image/png', href: '/favicon-16x16.png', sizes: '16x16' }, - { rel: 'icon', type: 'image/png', href: '/favicon-32x32.png', sizes: '32x32' }, - { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#ffffff' }, - { rel: 'apple-touch-icon', href: '/apple-touch-icon.png', sizes: '180x180' }, + { rel: 'icon', href: '/favicon.ico', sizes: 'any' }, + { rel: 'icon', type: 'image/svg+xml', href: '/favicon.svg' }, + { rel: 'apple-touch-icon', href: '/apple-touch-icon.png' }, ], - meta: [{ name: 'theme-color', content: '#ffffff' }], }, }, i18n, diff --git a/public-dev/apple-touch-icon.png b/public-dev/apple-touch-icon.png index f134f6da..fb9ca831 100644 Binary files a/public-dev/apple-touch-icon.png and b/public-dev/apple-touch-icon.png differ diff --git a/public-dev/favicon-16x16.png b/public-dev/favicon-16x16.png deleted file mode 100644 index b73d6ee2..00000000 Binary files a/public-dev/favicon-16x16.png and /dev/null differ diff --git a/public-dev/favicon-32x32.png b/public-dev/favicon-32x32.png deleted file mode 100644 index 4fb814b6..00000000 Binary files a/public-dev/favicon-32x32.png and /dev/null differ diff --git a/public-dev/favicon.ico b/public-dev/favicon.ico index 93ef82db..a0c1c31b 100644 Binary files a/public-dev/favicon.ico and b/public-dev/favicon.ico differ diff --git a/public-dev/favicon.png b/public-dev/favicon.png index faf76484..eea18b75 100644 Binary files a/public-dev/favicon.png and b/public-dev/favicon.png differ diff --git a/public-dev/favicon.svg b/public-dev/favicon.svg new file mode 100644 index 00000000..37c44df2 --- /dev/null +++ b/public-dev/favicon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public-dev/logo.svg b/public-dev/logo.svg index 2ddcc1b0..751e6da0 100644 --- a/public-dev/logo.svg +++ b/public-dev/logo.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/public-dev/pwa-192x192.png b/public-dev/pwa-192x192.png index a1aeffba..7d63e886 100644 Binary files a/public-dev/pwa-192x192.png and b/public-dev/pwa-192x192.png differ diff --git a/public-dev/pwa-512x512.png b/public-dev/pwa-512x512.png index 53dd3688..c89bdf14 100644 Binary files a/public-dev/pwa-512x512.png and b/public-dev/pwa-512x512.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 8ab60366..5408048a 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png deleted file mode 100644 index bd532e5c..00000000 Binary files a/public/favicon-16x16.png and /dev/null differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png deleted file mode 100644 index 4b26181f..00000000 Binary files a/public/favicon-32x32.png and /dev/null differ diff --git a/public/logo.svg b/public/logo.svg index 53f8e796..44487020 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/public/pwa-192x192.png b/public/pwa-192x192.png index 660e94e3..77670642 100644 Binary files a/public/pwa-192x192.png and b/public/pwa-192x192.png differ diff --git a/public/pwa-512x512.png b/public/pwa-512x512.png index 48c1e184..f3906862 100644 Binary files a/public/pwa-512x512.png and b/public/pwa-512x512.png differ diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg deleted file mode 100644 index 15b6f9b7..00000000 --- a/public/safari-pinned-tab.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - -Created by potrace 1.14, written by Peter Selinger 2001-2017 - - - - - - - - - -