Skip to content

Commit 3dabf10

Browse files
committed
flip vulnerabilities scale to get rid of tooltip
1 parent 17e8832 commit 3dabf10

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

src/lib/components/VulnerabilityBadges.svelte

+19-16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { percentageFormatter } from '$lib/utils/formatters';
44
import { severityToColor } from '$lib/utils/vulnerabilities';
55
6-
import { BodyShort, Loader, Tooltip } from '@nais/ds-svelte-community';
6+
import { BodyShort, Loader } from '@nais/ds-svelte-community';
77
88
type VulnerabilitySummary =
99
| {
@@ -29,14 +29,10 @@
2929
<div class="vulnerability-summary">
3030
{#if summary !== PendingValue}
3131
{#each categories as category (category)}
32-
<Tooltip content={category}>
33-
<BodyShort
34-
class="vulnerability-count"
35-
style="background-color: {severityToColor(category)}"
36-
>
37-
{summary[category]}
38-
</BodyShort>
39-
</Tooltip>
32+
<BodyShort class="vulnerability-count" style="background-color: {severityToColor(category)}">
33+
{summary[category]}
34+
</BodyShort>
35+
<div class="category">{category}</div>
4036
{/each}
4137
{:else}
4238
<Loader />
@@ -72,23 +68,30 @@
7268
{/if}
7369

7470
<style>
71+
.category {
72+
text-transform: capitalize;
73+
}
74+
7575
.vulnerability-summary {
76-
display: flex;
77-
flex-wrap: wrap;
78-
gap: 1px;
76+
display: grid;
77+
grid-template-columns: auto 1fr;
78+
align-items: center;
79+
column-gap: var(--a-spacing-2);
80+
row-gap: 1px;
7981
80-
:global(:first-child > .vulnerability-count) {
82+
:global(.vulnerability-count:first-of-type) {
8183
border-top-left-radius: 4px;
82-
border-bottom-left-radius: 4px;
84+
border-top-right-radius: 4px;
8385
}
8486
85-
:global(:last-child > .vulnerability-count) {
86-
border-top-right-radius: 4px;
87+
:global(.vulnerability-count:last-of-type) {
8788
border-bottom-right-radius: 4px;
89+
border-bottom-left-radius: 4px;
8890
}
8991
9092
:global(.vulnerability-count) {
9193
padding: 4px 10px;
94+
text-align: center;
9295
}
9396
}
9497

src/lib/components/WorkloadsWithSBOM.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,9 @@
407407
}
408408
}
409409
&.HIGH {
410-
background-color: var(--a-orange-200);
410+
background-color: color-mix(in oklab, var(--a-red-200), var(--a-orange-200));
411411
&:hover {
412-
background-color: var(--a-orange-300);
412+
background-color: color-mix(in oklab, var(--a-red-300), var(--a-orange-300));
413413
}
414414
}
415415
&.MEDIUM {

src/lib/utils/vulnerabilities.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export function severityToColor(severity: string): string {
33
case 'critical':
44
return 'var(--a-red-200)';
55
case 'high':
6-
return 'var(--a-orange-200)';
6+
return 'color-mix(in oklab, var(--a-red-200), var(--a-orange-200))';
77
case 'medium':
88
return 'var(--a-orange-200)';
99
case 'low':

0 commit comments

Comments
 (0)