Skip to content

Commit 2d3a64c

Browse files
committed
VersionList::Row: Simplify tooltip color highlights
1 parent b7e8c41 commit 2d3a64c

File tree

5 files changed

+38
-64
lines changed

5 files changed

+38
-64
lines changed

app/components/bracket-mark.hbs

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/components/bracket-mark.module.css

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/components/version-list/row.hbs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,7 @@
2020
{{@version.releaseTrack}}
2121
{{/if}}
2222

23-
<EmberTooltip @side="right" data-test-release-track-title>
24-
{{this.releaseTrackTitle}}
25-
{{#if this.displaysReleaseTrackModifiers}}
26-
{{#if @version.isPrerelease}}
27-
<BracketMark @color='yellow'>prerelease</BracketMark>
28-
{{/if}}
29-
{{#if this.hasAllReleaseTrackModifiers}}
30-
,
31-
{{/if}}
32-
{{#if @version.isHighestOfReleaseTrack}}
33-
<BracketMark @color='green'>latest</BracketMark>
34-
{{/if}}
35-
{{/if}}
36-
</EmberTooltip>
23+
<EmberTooltip @text={{this.releaseTrackTitle}} @side="right" data-test-release-track-title/>
3724
</div>
3825

3926
<LinkTo
@@ -70,7 +57,7 @@
7057
<EmberTooltip>
7158
{{date-format @version.created_at 'PPP'}}
7259
{{#if @version.isNew}}
73-
<BracketMark @color='orange'>recent</BracketMark>
60+
(<span local-class="new">new</span>)
7461
{{/if}}
7562
</EmberTooltip>
7663
</time>

app/components/version-list/row.js

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { action } from '@ember/object';
22
import { inject as service } from '@ember/service';
3+
import { htmlSafe } from '@ember/template';
34
import Component from '@glimmer/component';
45
import { tracked } from '@glimmer/tracking';
56

7+
import styles from './row.module.css';
8+
69
export default class VersionRow extends Component {
710
@service session;
811

@@ -11,7 +14,7 @@ export default class VersionRow extends Component {
1114
get releaseTrackTitle() {
1215
let { version } = this.args;
1316
if (version.yanked) {
14-
return 'This version was yanked';
17+
return htmlSafe(`This version was <span class="${styles['rt-yanked']}">yanked</span>`);
1518
}
1619
if (version.invalidSemver) {
1720
return `Failed to parse version ${version.num}`;
@@ -22,19 +25,26 @@ export default class VersionRow extends Component {
2225

2326
let { releaseTrack } = version;
2427

25-
return `Release Track: ${releaseTrack}`;
26-
}
27-
28-
get displaysReleaseTrackModifiers() {
29-
let { version } = this.args;
30-
31-
return (version.isPrerelease || version.isHighestOfReleaseTrack) && !version.yanked;
32-
}
28+
let modifiers = [];
29+
if (version.isPrerelease) {
30+
modifiers.push('prerelease');
31+
}
32+
if (version.isHighestOfReleaseTrack) {
33+
modifiers.push('latest');
34+
}
3335

34-
get hasAllReleaseTrackModifiers() {
35-
let { version } = this.args;
36+
let title = `Release Track: ${releaseTrack}`;
37+
if (modifiers.length !== 0) {
38+
let formattedModifiers = modifiers
39+
.map(modifier => {
40+
let klass = styles[`rt-${modifier}`];
41+
return klass ? `<span class='${klass}'>${modifier}</span>` : modifier;
42+
})
43+
.join(', ');
3644

37-
return version.isPrerelease && version.isHighestOfReleaseTrack;
45+
title += ` (${formattedModifiers})`;
46+
}
47+
return htmlSafe(title);
3848
}
3949

4050
get isOwner() {

app/components/version-list/row.module.css

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@
9494
}
9595
}
9696

97+
.rt-latest {
98+
color: hsl(136, 67%, 38%);
99+
}
100+
101+
.rt-prerelease {
102+
color: hsl(35, 95%, 59%);
103+
}
104+
105+
.rt-yanked {
106+
color: hsl(0, 87%, 58%);
107+
}
108+
97109
.num-link {
98110
color: var(--fg-color);
99111
font-weight: 500;
@@ -184,10 +196,8 @@
184196
}
185197
}
186198

187-
.date {
188-
&.new {
189-
color: hsl(39, 98%, 47%);
190-
}
199+
.date.new, :global(.tooltip) .new {
200+
color: hsl(39, 98%, 47%);
191201
}
192202

193203
.msrv {

0 commit comments

Comments
 (0)