Skip to content

Commit 29e9aaf

Browse files
committed
MET-6977 Chained Rerun Design
1 parent 1d09f95 commit 29e9aaf

File tree

2 files changed

+31
-27
lines changed

2 files changed

+31
-27
lines changed

projects/sandbox/src/app/dataset-info/dataset-info.component.html

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,26 @@
185185

186186
<!-- reruns -->
187187
@let hierarchy = hierarchyData(); @if(hierarchy) { @let childCount = hierarchy.children.length;
188+
189+
<span class="parent-dataset rerun-nav" *ngIf="hierarchyData(); let hierarchy">
190+
@let parent = hierarchy.parent; @let parent_id = parent ? parent.id : '';
191+
<a
192+
class="parent-link rerun-nav"
193+
[attr.linkText]="parent ? parent.id : '/'"
194+
[attr.tabindex]="!!parent ? 0 : -1"
195+
href="/dataset/{{ parent_id }}"
196+
[ngClass]="{
197+
disabled: !parent
198+
}"
199+
(click)="!!parent && navTo(parent_id)"
200+
(keydown.enter)="!!parent && navTo(parent_id)"
201+
><span
202+
[attr.content]="!!parent && parent.name.length ? parent.name : null"
203+
class="parent-label"
204+
></span
205+
></a>
206+
</span>
207+
188208
<div class="child-datasets list-container">
189209
<ul
190210
tabindex="-1"
@@ -330,25 +350,6 @@
330350
</div>
331351
}
332352

333-
<span class="parent-dataset rerun-nav" *ngIf="hierarchyData(); let hierarchy">
334-
@let parent = hierarchy.parent; @let parent_id = parent ? parent.id : '';
335-
<a
336-
class="parent-link rerun-nav"
337-
[attr.linkText]="parent ? parent.id : '/'"
338-
[attr.tabindex]="!!parent ? 0 : -1"
339-
href="/dataset/{{ parent_id }}"
340-
[ngClass]="{
341-
disabled: !parent
342-
}"
343-
(click)="!!parent && navTo(parent_id)"
344-
(keydown.enter)="!!parent && navTo(parent_id)"
345-
><span
346-
[attr.content]="!!parent && parent.name.length ? parent.name : null"
347-
class="parent-label"
348-
></span
349-
></a>
350-
</span>
351-
352353
<ul
353354
class="dataset-info container-h"
354355
*ngIf="datasetInfo(); let datasetInfo"

projects/sandbox/src/assets/sass/ancestry.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ $z-blur: 4;
210210
content: 'Reruns';
211211
color: variables-colours.$eu-orange;
212212
}
213+
&:focus-visible::after {
214+
transition: left $time1 linear;
215+
left: 22%;
216+
}
213217
}
214218
}
215219

@@ -948,16 +952,15 @@ body.theme-classic {
948952
transition: opacity $timesBoth linear, top $timesBoth linear;
949953
z-index: $z-blur;
950954

951-
&:not(:hover) {
952-
.parent-label {
953-
&::before {
954-
opacity: 0;
955-
}
956-
&::after {
957-
color: variables-colours.$eu-grey-middle;
958-
}
955+
&:not(:hover, :has(:focus)) .parent-label {
956+
&::before {
957+
opacity: 0;
958+
}
959+
&::after {
960+
color: variables-colours.$eu-grey-middle;
959961
}
960962
}
963+
961964
.parent-label {
962965
font-size: 1rem;
963966
position: absolute;

0 commit comments

Comments
 (0)