Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2021-12-03 00:42:59 +01:00
commit 7bb7f5a017
4 changed files with 467 additions and 444 deletions

View File

@ -1,6 +1,6 @@
{
"name": "swaf",
"version": "0.24.9",
"version": "0.24.10",
"description": "Structure Web Application Framework.",
"repository": "https://eternae.ink/ashpie/swaf",
"author": "Alice Gaudon <alice@gaudon.pro>",

View File

@ -3,10 +3,12 @@
import BaseFooter from "./base/BaseFooter.svelte";
import BaseHeader from "./base/BaseHeader.svelte";
import CommonScripts from "./CommonScripts.svelte";
import {locals} from '../../ts/stores.js';
export let title: string;
export let h1: string = title;
export let description: string;
export let previewImageUrl: string | undefined = undefined;
export let refresh_after: number | undefined = undefined;
export let noHeader: boolean = false;
export let noH1: boolean = false;
@ -37,8 +39,22 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>{title || 'Undefined title'}</title>
<!-- Open Graph / Facebook -->
<meta property="og:type" content="website">
<meta property="og:title" content={title}>
<meta property="og:url" content="{$locals.app.public_url + $locals.url}">
<meta property="twitter:title" content={title}>
<meta property="twitter:url" content={$locals.app.public_url + $locals.url}>
{#if description}
<meta name="description" content={description}>
<meta property="og:description" content={description}>
<meta property="twitter:description" content={description}>
{/if}
{#if previewImageUrl}
<meta property="og:image" content={previewImageUrl}>
<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:image" content={previewImageUrl}>
{/if}
<link rel="shortcut icon" type="image/png" href="/img/logox1024.png">

View File

@ -135,7 +135,7 @@
background-image: url(../../img/logo.svg);
background-repeat: no-repeat;
background-position: center;
background-size: 64px;
background-size: contain;
opacity: 0.075;
filter: contrast(0);

891
yarn.lock

File diff suppressed because it is too large Load Diff