Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8dfab618f7 | ||
|
|
c0c1281415 |
@@ -245,6 +245,38 @@ test('hver fane under indstillinger renderer', async ({ page }) => {
|
|||||||
expect(trouble).toEqual([]);
|
expect(trouble).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('menu- og brødtekststørrelse sættes hver for sig og overlever en genindlæsning', async ({
|
||||||
|
page
|
||||||
|
}) => {
|
||||||
|
const trouble = watchForTrouble(page);
|
||||||
|
await page.goto('/indstillinger');
|
||||||
|
|
||||||
|
// Two independent knobs under Udseende — the sidebar's size, and the body text's.
|
||||||
|
await page.getByLabel('Menu', { exact: true }).selectOption('large');
|
||||||
|
await page.getByLabel('Brødtekst', { exact: true }).selectOption('xl');
|
||||||
|
await expect(page.getByLabel('Menu', { exact: true })).toHaveValue('large');
|
||||||
|
|
||||||
|
const attrs = () =>
|
||||||
|
page.evaluate(() => [
|
||||||
|
document.documentElement.dataset.menuSize,
|
||||||
|
document.documentElement.dataset.textSize
|
||||||
|
]);
|
||||||
|
expect(await attrs()).toEqual(['large', 'xl']);
|
||||||
|
|
||||||
|
// They live in localStorage like the theme, so they survive a reload — and are
|
||||||
|
// applied before first paint, so the picker comes back showing the saved choice.
|
||||||
|
await page.reload();
|
||||||
|
expect(await attrs()).toEqual(['large', 'xl']);
|
||||||
|
await expect(page.getByLabel('Menu', { exact: true })).toHaveValue('large');
|
||||||
|
|
||||||
|
// Put them back, so the shared account does not leak a size into other tests.
|
||||||
|
await page.getByLabel('Menu', { exact: true }).selectOption('default');
|
||||||
|
await page.getByLabel('Brødtekst', { exact: true }).selectOption('default');
|
||||||
|
expect(await attrs()).toEqual([undefined, undefined]);
|
||||||
|
|
||||||
|
expect(trouble).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The PWA's own files. Both of the bugs found last in this project were of this
|
* The PWA's own files. Both of the bugs found last in this project were of this
|
||||||
* kind — a manifest promising icons that were never generated — and they are
|
* kind — a manifest promising icons that were never generated — and they are
|
||||||
|
|||||||
@@ -86,6 +86,12 @@
|
|||||||
--text-xl: 1.375rem;
|
--text-xl: 1.375rem;
|
||||||
--text-2xl: 1.75rem;
|
--text-2xl: 1.75rem;
|
||||||
|
|
||||||
|
/* The sidebar's own text size, its own knob (Settings → Appearance) so the menu
|
||||||
|
can be made easier to read without dragging the whole list with it. Default is
|
||||||
|
a step up from the old --text-sm the nav used, at medium weight, so the menu
|
||||||
|
items read as menu items. [data-menu-size] on <html> overrides it. */
|
||||||
|
--menu-size: 0.9375rem;
|
||||||
|
|
||||||
/* Spacing on a 4px grid. */
|
/* Spacing on a 4px grid. */
|
||||||
--s1: 0.25rem;
|
--s1: 0.25rem;
|
||||||
--s2: 0.5rem;
|
--s2: 0.5rem;
|
||||||
@@ -516,3 +522,41 @@ button {
|
|||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
letter-spacing: -0.01em;
|
letter-spacing: -0.01em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Body text size — its own control in Settings → Appearance, for reading the list
|
||||||
|
and the notes larger (or smaller) without touching the menu. It re-scales the
|
||||||
|
shared type tokens the same way a look does; placed after the looks so that an
|
||||||
|
explicit size choice wins the tokens they both set. The menu has its own knob
|
||||||
|
below and does not move with this one. */
|
||||||
|
[data-text-size='small'] {
|
||||||
|
--text-base: 0.875rem;
|
||||||
|
--text-sm: 0.75rem;
|
||||||
|
--text-lg: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-text-size='large'] {
|
||||||
|
--text-base: 1.0625rem;
|
||||||
|
--text-sm: 0.9375rem;
|
||||||
|
--text-lg: 1.1875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-text-size='xl'] {
|
||||||
|
--text-base: 1.1875rem;
|
||||||
|
--text-sm: 1.0625rem;
|
||||||
|
--text-lg: 1.3125rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Menu (sidebar) font size — independent of the body size above, because the two
|
||||||
|
are separate questions: a menu you can read at a glance, and a list you can read
|
||||||
|
a paragraph of. */
|
||||||
|
[data-menu-size='small'] {
|
||||||
|
--menu-size: 0.8125rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-menu-size='large'] {
|
||||||
|
--menu-size: 1.0625rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-menu-size='xl'] {
|
||||||
|
--menu-size: 1.1875rem;
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,6 +28,14 @@
|
|||||||
// face and again in another, which is a visible jump.
|
// face and again in another, which is a visible jump.
|
||||||
const look = localStorage.getItem('verdande:look');
|
const look = localStorage.getItem('verdande:look');
|
||||||
if (look && look !== 'verdande') document.documentElement.dataset.look = look;
|
if (look && look !== 'verdande') document.documentElement.dataset.look = look;
|
||||||
|
|
||||||
|
// The font-size choices change layout too, so they belong before first
|
||||||
|
// paint for the same reason: otherwise the sidebar and the list are drawn
|
||||||
|
// once at one size and again at another.
|
||||||
|
const menuSize = localStorage.getItem('verdande:menu-size');
|
||||||
|
if (menuSize && menuSize !== 'default') document.documentElement.dataset.menuSize = menuSize;
|
||||||
|
const textSize = localStorage.getItem('verdande:text-size');
|
||||||
|
if (textSize && textSize !== 'default') document.documentElement.dataset.textSize = textSize;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Private browsing can refuse localStorage; the dark default stands.
|
// Private browsing can refuse localStorage; the dark default stands.
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1441,7 +1441,10 @@
|
|||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-size: var(--text-sm);
|
/* Its own size (Settings → Appearance) and medium weight, so the menu items
|
||||||
|
carry more than the muted small text they used to and read at a glance. */
|
||||||
|
font-size: var(--menu-size);
|
||||||
|
font-weight: 500;
|
||||||
transition:
|
transition:
|
||||||
background var(--fast) var(--ease),
|
background var(--fast) var(--ease),
|
||||||
color var(--fast) var(--ease);
|
color var(--fast) var(--ease);
|
||||||
@@ -1455,7 +1458,7 @@
|
|||||||
a.active {
|
a.active {
|
||||||
background: var(--surface-raised);
|
background: var(--surface-raised);
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
font-weight: 500;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Only your own projects reorder. A shared one sits where its owner put it —
|
/* Only your own projects reorder. A shared one sits where its owner put it —
|
||||||
|
|||||||
@@ -230,6 +230,14 @@ export const da = {
|
|||||||
'Gemmes i denne browser. Det er en egenskab ved den skærm, du sidder ved — en bærbar i solen og en skærm i et mørkt rum vil have hvert sit svar.',
|
'Gemmes i denne browser. Det er en egenskab ved den skærm, du sidder ved — en bærbar i solen og en skærm i et mørkt rum vil have hvert sit svar.',
|
||||||
'account.look': 'Udseende',
|
'account.look': 'Udseende',
|
||||||
'account.lookHint': 'Temaet siger hvor lyst. Det her siger hvordan det læses — skrift, luft og hjørner. De to kan kombineres frit.',
|
'account.lookHint': 'Temaet siger hvor lyst. Det her siger hvordan det læses — skrift, luft og hjørner. De to kan kombineres frit.',
|
||||||
|
'account.sizes': 'Skriftstørrelse',
|
||||||
|
'account.sizesHint': 'Menuen og brødteksten kan sættes hver for sig — den ene er et blik ned over en liste, den anden en tekst, man læser.',
|
||||||
|
'account.menuSize': 'Menu',
|
||||||
|
'account.textSize': 'Brødtekst',
|
||||||
|
'size.small': 'Lille',
|
||||||
|
'size.default': 'Standard',
|
||||||
|
'size.large': 'Stor',
|
||||||
|
'size.xl': 'Størst',
|
||||||
'look.verdande': 'Verdande',
|
'look.verdande': 'Verdande',
|
||||||
'look.verdandeNote': 'Som du kender den.',
|
'look.verdandeNote': 'Som du kender den.',
|
||||||
'look.rolig': 'Rolig',
|
'look.rolig': 'Rolig',
|
||||||
|
|||||||
@@ -226,6 +226,14 @@ export const en = {
|
|||||||
'Kept in this browser. It is a property of the screen you are sitting at — a laptop in the sun and a monitor in a dark room want different answers.',
|
'Kept in this browser. It is a property of the screen you are sitting at — a laptop in the sun and a monitor in a dark room want different answers.',
|
||||||
'account.look': 'Appearance',
|
'account.look': 'Appearance',
|
||||||
'account.lookHint': 'The theme says how bright. This says how it reads — typeface, air and corners. The two combine freely.',
|
'account.lookHint': 'The theme says how bright. This says how it reads — typeface, air and corners. The two combine freely.',
|
||||||
|
'account.sizes': 'Text size',
|
||||||
|
'account.sizesHint': 'The menu and the body text set separately — one is a glance down a list, the other a paragraph you read.',
|
||||||
|
'account.menuSize': 'Menu',
|
||||||
|
'account.textSize': 'Body text',
|
||||||
|
'size.small': 'Small',
|
||||||
|
'size.default': 'Default',
|
||||||
|
'size.large': 'Large',
|
||||||
|
'size.xl': 'Largest',
|
||||||
'look.verdande': 'Verdande',
|
'look.verdande': 'Verdande',
|
||||||
'look.verdandeNote': 'As you know it.',
|
'look.verdandeNote': 'As you know it.',
|
||||||
'look.rolig': 'Calm',
|
'look.rolig': 'Calm',
|
||||||
|
|||||||
@@ -1051,6 +1051,52 @@ class Look {
|
|||||||
|
|
||||||
export const look = new Look();
|
export const look = new Look();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The font-size steps, shared by the menu and the body-text controls. `default`
|
||||||
|
* carries no attribute, so the base tokens in app.css stand unchanged.
|
||||||
|
*/
|
||||||
|
export const SIZES = [
|
||||||
|
{ id: 'small', name: 'size.small' },
|
||||||
|
{ id: 'default', name: 'size.default' },
|
||||||
|
{ id: 'large', name: 'size.large' },
|
||||||
|
{ id: 'xl', name: 'size.xl' }
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A font-size preference — the same shape as Look: kept in localStorage and
|
||||||
|
* mirrored onto <html>, where app.html sets it before first paint so a chosen size
|
||||||
|
* does not flash in at the default and resize. Two instances below, because the
|
||||||
|
* menu and the body text are separate questions.
|
||||||
|
*/
|
||||||
|
class Sizing {
|
||||||
|
current = $state('default');
|
||||||
|
#key;
|
||||||
|
#attr;
|
||||||
|
|
||||||
|
constructor(key, attr) {
|
||||||
|
this.#key = key;
|
||||||
|
this.#attr = attr;
|
||||||
|
if (typeof document !== 'undefined') {
|
||||||
|
this.current = document.documentElement.dataset[attr] ?? 'default';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
set(id) {
|
||||||
|
if (!SIZES.some((s) => s.id === id)) return;
|
||||||
|
this.current = id;
|
||||||
|
if (id === 'default') delete document.documentElement.dataset[this.#attr];
|
||||||
|
else document.documentElement.dataset[this.#attr] = id;
|
||||||
|
try {
|
||||||
|
localStorage.setItem(this.#key, id);
|
||||||
|
} catch {
|
||||||
|
// Private browsing; the choice simply will not persist.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const menuSize = new Sizing('verdande:menu-size', 'menuSize');
|
||||||
|
export const textSize = new Sizing('verdande:text-size', 'textSize');
|
||||||
|
|
||||||
/** Theme, kept in localStorage and applied to the document element. */
|
/** Theme, kept in localStorage and applied to the document element. */
|
||||||
class Theme {
|
class Theme {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
/** Konto: who you are, your password, and the second factor. */
|
/** Konto: who you are, your password, and the second factor. */
|
||||||
import { api, humanMessage } from '$lib/api.js';
|
import { api, humanMessage } from '$lib/api.js';
|
||||||
import { app, theme, THEMES, look, LOOKS } from '$lib/stores.svelte.js';
|
import { app, theme, THEMES, look, LOOKS, menuSize, textSize, SIZES } from '$lib/stores.svelte.js';
|
||||||
import { t, plural, i18n } from '$lib/i18n.svelte.js';
|
import { t, plural, i18n } from '$lib/i18n.svelte.js';
|
||||||
import { supported, register } from '$lib/passkey.js';
|
import { supported, register } from '$lib/passkey.js';
|
||||||
import { ago } from '$lib/when.js';
|
import { ago } from '$lib/when.js';
|
||||||
@@ -362,6 +362,40 @@
|
|||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Two more axes: how large the menu reads and how large the body text reads.
|
||||||
|
Separate on purpose — one is a glance down a list of names, the other is a
|
||||||
|
paragraph you sit and read. -->
|
||||||
|
<div class="sizes">
|
||||||
|
<h3>{t('account.sizes')}</h3>
|
||||||
|
<p class="hint">{t('account.sizesHint')}</p>
|
||||||
|
<div class="size-row">
|
||||||
|
<div class="size-field">
|
||||||
|
<label for="menu-size">{t('account.menuSize')}</label>
|
||||||
|
<select
|
||||||
|
id="menu-size"
|
||||||
|
value={menuSize.current}
|
||||||
|
onchange={(e) => menuSize.set(e.currentTarget.value)}
|
||||||
|
>
|
||||||
|
{#each SIZES as option (option.id)}
|
||||||
|
<option value={option.id}>{t(option.name)}</option>
|
||||||
|
{/each}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="size-field">
|
||||||
|
<label for="text-size">{t('account.textSize')}</label>
|
||||||
|
<select
|
||||||
|
id="text-size"
|
||||||
|
value={textSize.current}
|
||||||
|
onchange={(e) => textSize.set(e.currentTarget.value)}
|
||||||
|
>
|
||||||
|
{#each SIZES as option (option.id)}
|
||||||
|
<option value={option.id}>{t(option.name)}</option>
|
||||||
|
{/each}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="panel">
|
<section class="panel">
|
||||||
@@ -619,6 +653,37 @@
|
|||||||
margin-bottom: var(--s1);
|
margin-bottom: var(--s1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sizes {
|
||||||
|
margin-top: var(--s4);
|
||||||
|
padding-top: var(--s3);
|
||||||
|
border-top: 1px solid var(--line);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sizes h3 {
|
||||||
|
font-size: var(--text-sm);
|
||||||
|
margin-bottom: var(--s1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.size-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
|
||||||
|
gap: var(--s3);
|
||||||
|
margin-top: var(--s3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.size-field {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: var(--s1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.size-field label {
|
||||||
|
font-size: var(--text-xs);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
color: var(--ink-faint);
|
||||||
|
}
|
||||||
|
|
||||||
.look-row {
|
.look-row {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
|
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
|
||||||
|
|||||||
Reference in New Issue
Block a user