Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec147cd1ba |
|
Before Width: | Height: | Size: 249 KiB After Width: | Height: | Size: 248 KiB |
|
Before Width: | Height: | Size: 310 KiB After Width: | Height: | Size: 308 KiB |
|
Before Width: | Height: | Size: 230 KiB After Width: | Height: | Size: 228 KiB |
|
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 147 KiB |
|
Before Width: | Height: | Size: 334 KiB After Width: | Height: | Size: 333 KiB |
|
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 245 KiB |
|
Before Width: | Height: | Size: 266 KiB After Width: | Height: | Size: 265 KiB |
|
Before Width: | Height: | Size: 354 KiB After Width: | Height: | Size: 353 KiB |
|
Before Width: | Height: | Size: 338 KiB After Width: | Height: | Size: 336 KiB |
|
Before Width: | Height: | Size: 230 KiB After Width: | Height: | Size: 229 KiB |
|
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 253 KiB |
|
Before Width: | Height: | Size: 239 KiB After Width: | Height: | Size: 238 KiB |
|
Before Width: | Height: | Size: 245 KiB After Width: | Height: | Size: 243 KiB |
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 243 KiB |
|
Before Width: | Height: | Size: 219 KiB After Width: | Height: | Size: 218 KiB |
|
Before Width: | Height: | Size: 228 KiB After Width: | Height: | Size: 227 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
@@ -371,9 +371,9 @@ test('en projektgruppe kan foldes, fyldes og slettes uden at tage projekterne me
|
|||||||
await sidebar.getByLabel('Gruppens navn').fill('Arbejde');
|
await sidebar.getByLabel('Gruppens navn').fill('Arbejde');
|
||||||
await sidebar.getByLabel('Gruppens navn').press('Enter');
|
await sidebar.getByLabel('Gruppens navn').press('Enter');
|
||||||
|
|
||||||
// The name is a link to the group's own page; the chevron beside it is a
|
// The name is a link to the group's own page; the folder icon beside it is a
|
||||||
// separate button that folds. Two intentions, two targets — the single one they
|
// separate button that folds. Two intentions, two targets — the single one they
|
||||||
// used to share could only ever serve the smaller.
|
// used to share could only ever serve the smaller, and neither wears an arrow.
|
||||||
//
|
//
|
||||||
// `exact` on the link, because a group's name is a user-chosen word that can
|
// `exact` on the link, because a group's name is a user-chosen word that can
|
||||||
// turn up inside another control's name, and Playwright matches an accessible
|
// turn up inside another control's name, and Playwright matches an accessible
|
||||||
@@ -389,13 +389,14 @@ test('en projektgruppe kan foldes, fyldes og slettes uden at tage projekterne me
|
|||||||
// The clipping half is here because it was once broken: "Omdøb" and "Slet" sat
|
// The clipping half is here because it was once broken: "Omdøb" and "Slet" sat
|
||||||
// in the flow reserving their width even while invisible, so ARBEJDE was drawn
|
// in the flow reserving their width even while invisible, so ARBEJDE was drawn
|
||||||
// as "ARBE". The alignment half changed meaning with the redesign: a group now
|
// as "ARBE". The alignment half changed meaning with the redesign: a group now
|
||||||
// carries a fold chevron and a section icon just like "Projekter" above it, and
|
// carries a section icon just like "Projekter" above it, and belongs to that
|
||||||
// belongs to that heading tier rather than to the project rows below.
|
// heading tier rather than to the project rows below.
|
||||||
const shape = await sidebar.locator('.folder-head').evaluate((el) => {
|
const shape = await sidebar.locator('.folder-head').evaluate((el) => {
|
||||||
const link = el.querySelector('h2 a');
|
const link = el.querySelector('h2 a');
|
||||||
// The leading mark is now the section icon, the same folder/funnel/tag glyph
|
// The leading mark is the section icon in its own fold button, the same
|
||||||
// the system headings carry — a group and a section read identically.
|
// folder/funnel/tag glyph the system headings carry — a group and a section
|
||||||
const name = { ...link.querySelector('.head-icon').getBoundingClientRect().toJSON() };
|
// read identically, and the icon sits before the name, not inside the link.
|
||||||
|
const name = { ...el.querySelector('.head-icon').getBoundingClientRect().toJSON() };
|
||||||
return {
|
return {
|
||||||
clipped: link.scrollWidth > link.clientWidth + 1,
|
clipped: link.scrollWidth > link.clientWidth + 1,
|
||||||
left: name.left,
|
left: name.left,
|
||||||
@@ -408,7 +409,7 @@ test('en projektgruppe kan foldes, fyldes og slettes uden at tage projekterne me
|
|||||||
expect(shape.count, 'navnet og tallet overlapper').toBeGreaterThanOrEqual(shape.right);
|
expect(shape.count, 'navnet og tallet overlapper').toBeGreaterThanOrEqual(shape.right);
|
||||||
|
|
||||||
// A group is a heading, not a project row: it belongs to the same tier as
|
// A group is a heading, not a project row: it belongs to the same tier as
|
||||||
// "Projekter" and the other system sections — chevron, icon, bold name — and
|
// "Projekter" and the other system sections — icon, bold name, no arrow — and
|
||||||
// starts where they start, not where the projects filed under it do. Measured
|
// starts where they start, not where the projects filed under it do. Measured
|
||||||
// icon to icon, the one mark both headings share.
|
// icon to icon, the one mark both headings share.
|
||||||
const sectionLeft = await sidebar
|
const sectionLeft = await sidebar
|
||||||
@@ -440,13 +441,13 @@ test('en projektgruppe kan foldes, fyldes og slettes uden at tage projekterne me
|
|||||||
'false'
|
'false'
|
||||||
);
|
);
|
||||||
|
|
||||||
// A group's chevron is in the flow now, the same one the system sections carry —
|
// The fold control is the bare folder icon now — no chevron, and no --surface
|
||||||
// no absolute mark with a --surface field behind it, so a folded group no longer
|
// field behind it, so a folded group leaves no pale square beside its name on
|
||||||
// leaves a pale square beside its name on the sunken bar.
|
// the sunken bar.
|
||||||
const chevronBg = await sidebar
|
const foldBg = await sidebar
|
||||||
.locator('.folder-head .chevron-button')
|
.locator('.folder-head .fold-icon')
|
||||||
.evaluate((el) => getComputedStyle(el).backgroundColor);
|
.evaluate((el) => getComputedStyle(el).backgroundColor);
|
||||||
expect(chevronBg, 'chevronen har en firkant bag sig').toBe('rgba(0, 0, 0, 0)');
|
expect(foldBg, 'foldeknappen har en firkant bag sig').toBe('rgba(0, 0, 0, 0)');
|
||||||
|
|
||||||
await sidebar.getByRole('button', { name: /^Fold Arbejde/ }).click();
|
await sidebar.getByRole('button', { name: /^Fold Arbejde/ }).click();
|
||||||
|
|
||||||
|
|||||||
@@ -682,13 +682,14 @@
|
|||||||
<!--
|
<!--
|
||||||
A fixed heading that folds, the same way a project group's does.
|
A fixed heading that folds, the same way a project group's does.
|
||||||
|
|
||||||
One snippet for all four rather than four copies of a chevron and an aria
|
One snippet for all four rather than four copies of an icon and an aria
|
||||||
attribute: they have to behave identically, and the group heading is already
|
attribute: they have to behave identically, and the group heading is already
|
||||||
the proof that they drift otherwise — it grew a fold, a colour and two
|
the proof that they drift otherwise — it grew a fold, a colour and two
|
||||||
actions while these stayed plain text.
|
actions while these stayed plain text.
|
||||||
|
|
||||||
The whole heading is the target, not the chevron. At this size a lone chevron
|
The whole heading is the target, and the icon is the mark: no arrow beside it.
|
||||||
is something you miss, and the name is where the eye already is.
|
At this size an extra glyph is clutter, and the name is where the eye already
|
||||||
|
is.
|
||||||
-->
|
-->
|
||||||
<!-- One monochrome mark per kind of heading, so a section and a group read as the
|
<!-- One monochrome mark per kind of heading, so a section and a group read as the
|
||||||
same kind of thing — a folder of projects, a funnel of filters, a tag of
|
same kind of thing — a folder of projects, a funnel of filters, a tag of
|
||||||
@@ -749,19 +750,15 @@
|
|||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
{#snippet foldHeading(key, label)}
|
{#snippet foldHeading(key, label)}
|
||||||
|
<!-- No chevron: a system section has no page and nothing to rename, so the
|
||||||
|
whole heading is one button that folds it. The icon and the bold name are
|
||||||
|
the whole control — an arrow beside them was only ever saying "clickable"
|
||||||
|
twice. -->
|
||||||
<h2 class="fold">
|
<h2 class="fold">
|
||||||
<button
|
<button
|
||||||
onclick={() => app.toggleSection(key)}
|
onclick={() => app.toggleSection(key)}
|
||||||
aria-expanded={!app.sectionCollapsed(key)}
|
aria-expanded={!app.sectionCollapsed(key)}
|
||||||
>
|
>
|
||||||
<svg
|
|
||||||
class="chevron"
|
|
||||||
class:collapsed={app.sectionCollapsed(key)}
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path d="M6 9l6 6 6-6" />
|
|
||||||
</svg>
|
|
||||||
{@render sectionIcon(key)}
|
{@render sectionIcon(key)}
|
||||||
{label}
|
{label}
|
||||||
</button>
|
</button>
|
||||||
@@ -930,31 +927,22 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
{:else}
|
{:else}
|
||||||
<!-- The button sits inside the heading, not around it, the same way a
|
<!-- No chevron: the folder icon itself folds the group, and the name
|
||||||
project's title does: a group *is* a heading in the sidebar, and
|
beside it opens the group's own page. Two intentions, two targets,
|
||||||
wrapping an h2 in a button both invalidates the markup and takes
|
but no arrow to clutter the rail — the icon a section carries is
|
||||||
the heading away from a screen reader. The whole heading folds —
|
the same one that folds it here. The button sits inside the
|
||||||
at this size a lone chevron is a target you miss, and the name is
|
heading, not around it: a group *is* a heading, and wrapping an h2
|
||||||
where the eye already is. -->
|
in a button both invalidates the markup and takes the heading from
|
||||||
<!-- The chevron folds; the name opens the group's own page. Two
|
a screen reader. -->
|
||||||
targets in one heading, because they are two different intentions
|
|
||||||
and the old single one could only ever serve the smaller. -->
|
|
||||||
<button
|
<button
|
||||||
class="chevron-button"
|
class="fold-icon"
|
||||||
onclick={() => app.toggleGroup(group.id)}
|
onclick={() => app.toggleGroup(group.id)}
|
||||||
aria-expanded={!group.collapsed}
|
aria-expanded={!group.collapsed}
|
||||||
aria-label={group.collapsed
|
aria-label={group.collapsed
|
||||||
? t('sidebar.unfold', { name: group.name })
|
? t('sidebar.unfold', { name: group.name })
|
||||||
: t('sidebar.fold', { name: group.name })}
|
: t('sidebar.fold', { name: group.name })}
|
||||||
>
|
>
|
||||||
<svg
|
{@render sectionIcon('group')}
|
||||||
class="chevron"
|
|
||||||
class:collapsed={group.collapsed}
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path d="M6 9l6 6 6-6" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
</button>
|
||||||
<h2 class="fold">
|
<h2 class="fold">
|
||||||
<!-- Navigation waits two tenths of a second for a second click. A
|
<!-- Navigation waits two tenths of a second for a second click. A
|
||||||
@@ -975,7 +963,6 @@
|
|||||||
}, 200);
|
}, 200);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{@render sectionIcon('group')}
|
|
||||||
{group.name}
|
{group.name}
|
||||||
</a>
|
</a>
|
||||||
</h2>
|
</h2>
|
||||||
@@ -1425,35 +1412,17 @@
|
|||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The chevron on its own, so the name beside it can be a link to the group's
|
/* The folder icon is the fold toggle now — no chevron beside it. A bare icon
|
||||||
page. Sized as a target rather than as a glyph: 11px of arrow is something
|
button the size of the icon it holds: the name next to it opens the group's
|
||||||
you miss. */
|
page, this folds it, and neither wears an arrow to say so. */
|
||||||
/* The chevron sits on top of the group's dot rather than before it. In the flow
|
.fold-icon {
|
||||||
it pushed the name 22px further in than a project's, so groups read as if
|
|
||||||
they were filed under the projects above them — the opposite of what they
|
|
||||||
are. Out of the flow, a group's name starts exactly where a project's does.
|
|
||||||
The dot is the resting state; the chevron takes over on hover or focus, and
|
|
||||||
stays put while the group is folded, so a folded group still shows the way
|
|
||||||
back open. */
|
|
||||||
/* Uden baggrund. Knappen dækkede prikken med et felt i --surface, og på den
|
|
||||||
sænkede bjælke er det en lys firkant: en foldet gruppe stod med en hvid
|
|
||||||
klods ud for navnet permanent, fordi chevronen bliver stående, når gruppen
|
|
||||||
er lukket. Prikken tones ud i stedet for at blive dækket — det er samme
|
|
||||||
skifte, uden noget at male henover den med. */
|
|
||||||
/* A group folds from its own chevron, the same one the system sections carry —
|
|
||||||
in the flow before the name now, not an absolute mark that appeared on hover,
|
|
||||||
so a group and a section read identically at rest. The name beside it is still
|
|
||||||
a link to the group's page; the chevron is the second intention. */
|
|
||||||
.chevron-button {
|
|
||||||
flex: none;
|
flex: none;
|
||||||
width: 14px;
|
|
||||||
height: 14px;
|
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: center;
|
||||||
color: inherit;
|
color: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.chevron-button:hover {
|
.fold-icon:hover {
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1482,22 +1451,6 @@
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.chevron {
|
|
||||||
width: 11px;
|
|
||||||
height: 11px;
|
|
||||||
flex: none;
|
|
||||||
fill: none;
|
|
||||||
stroke: currentColor;
|
|
||||||
stroke-width: 2.4;
|
|
||||||
stroke-linecap: round;
|
|
||||||
stroke-linejoin: round;
|
|
||||||
transition: transform var(--fast) var(--ease);
|
|
||||||
}
|
|
||||||
|
|
||||||
.chevron.collapsed {
|
|
||||||
transform: rotate(-90deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Hidden until the heading is hovered, like the section actions on a project
|
/* Hidden until the heading is hovered, like the section actions on a project
|
||||||
page: two buttons permanently beside a label stop it reading as a label. */
|
page: two buttons permanently beside a label stop it reading as a label. */
|
||||||
.folder-head .count {
|
.folder-head .count {
|
||||||
|
|||||||