Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ exports[`Results View The table should match snapshot and other elements should
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ exports[`Results Table Should match snapshot 1`] = `
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -2149,7 +2149,7 @@ exports[`Results Table Should match snapshot 1`] = `
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -4117,7 +4117,7 @@ exports[`Results Table for MannWhitneyResultsItem for mann-whitney-u testVersion
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -4813,7 +4813,7 @@ exports[`Results Table for MannWhitneyResultsItem for mann-whitney-u testVersion
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -5402,7 +5402,7 @@ exports[`Results Table for MannWhitneyResultsItem for mann-whitney-u testVersion
</strong>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -5943,7 +5943,7 @@ exports[`Results Table should render different blocks when rendering several rev
</strong>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ exports[`Results View The table should match snapshot and other elements should
</div>
</div>
<div
class="fexjzun"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ exports[`SubtestsResultsView Component Tests should render the subtests results
</span>
</div>
<div
class="f1oxa67k"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -2396,7 +2396,7 @@ exports[`SubtestsViewCompareOverTime Component Tests in mann-whitney-u testVersi
</span>
</div>
<div
class="f1oxa67k"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -3825,7 +3825,7 @@ exports[`SubtestsViewCompareOverTime Component Tests in mann-whitney-u testVersi
</span>
</div>
<div
class="f1oxa67k"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -5254,7 +5254,7 @@ exports[`SubtestsViewCompareOverTime Component Tests renders over-time view when
</span>
</div>
<div
class="f1oxa67k"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down Expand Up @@ -6683,7 +6683,7 @@ exports[`SubtestsViewCompareOverTime Component Tests should render the subtests
</span>
</div>
<div
class="f1oxa67k"
class="MuiBox-root css-56tgmi"
>
<span
class="f1rpr1m5"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type ReactNode } from 'react';

import AppleIcon from '@mui/icons-material/Apple';
import { Link } from '@mui/material';
import { Box, Link } from '@mui/material';
import Tooltip from '@mui/material/Tooltip';
import { useLoaderData } from 'react-router';
import { style } from 'typestyle';
Expand Down Expand Up @@ -173,14 +173,34 @@ function SubtestsRevisionHeader(props: SubtestsRevisionHeaderProps) {
</span>
</Tooltip>
</div>
<div className={styles.tagsOptions}>
<Box
sx={{
display: 'flex',
flexWrap: 'wrap',
gap: '4px',
margin: '0 4px',
textAlign: 'right',
'& span': {
color: 'tagOptions.text',
},
'& span:nth-of-type(3n)': {
bgcolor: 'tagOptions.backgroundColorOption1',
},
'& span:nth-of-type(3n+1)': {
bgcolor: 'tagOptions.backgroundColorOption2',
},
'& span:nth-of-type(3n+2)': {
bgcolor: 'tagOptions.backgroundColorOption3',
},
}}
>
<span className={styles.chip}>{header.option_name}</span>
{extraOptions.map((option, index) => (
<span className={styles.chip} key={index}>
{option}
</span>
))}
</div>
</Box>
</div>
);
}
Expand Down
26 changes: 23 additions & 3 deletions src/components/CompareResults/TestHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from '@mui/material';
import { Box, Link } from '@mui/material';
import { style } from 'typestyle';

import LinkToRevision from './LinkToRevision';
Expand Down Expand Up @@ -118,14 +118,34 @@ export default function TestHeader(props: TestHeaderProps) {
</>
)}
</div>
<div className={styles.tagsOptions}>
<Box
sx={{
display: 'flex',
flexWrap: 'wrap',
gap: '4px',
margin: '0 4px',
textAlign: 'right',
'& span': {
color: 'tagOptions.text',
},
'& span:nth-of-type(3n)': {
bgcolor: 'tagOptions.backgroundColorOption1',
},
'& span:nth-of-type(3n+1)': {
bgcolor: 'tagOptions.backgroundColorOption2',
},
'& span:nth-of-type(3n+2)': {
bgcolor: 'tagOptions.backgroundColorOption3',
},
}}
>
<span className={styles.chip}>{result.option_name}</span>
{extraOptions.map((option, index) => (
<span className={styles.chip} key={index}>
{option}
</span>
))}
</div>
</Box>
</div>
);
}
Expand Down
10 changes: 10 additions & 0 deletions src/styles/Colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ export enum Colors {
Background500Dark = '#004725',
BackgroundScrimDark = '#5b5b66 45%',

//tag option colors light theme
TagOptionBackground3n = '#592ACB',
TagOptionBackground3n1 = '#005E5E',
TagOptionBackground3n2 = '#0250BB',

//tag option colors dark theme
TagOptionBackground3nDark = '#E88CE8',
TagOptionBackground3n1Dark = '#97E6C1',
TagOptionBackground3n2Dark = '#00FFFFFC',

//border colors light theme
BorderDefault = '#8F8F9D',
BorderDropdownMenu = '#CFCFD8',
Expand Down
12 changes: 12 additions & 0 deletions src/theme/protocolTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ const lightMode = {
background: Colors.Background100,
compareMetricsBg: Colors.Background300,
},
tagOptions: {
text: Colors.InvertedText,
backgroundColorOption1: Colors.TagOptionBackground3n,
backgroundColorOption2: Colors.TagOptionBackground3n1,
backgroundColorOption3: Colors.TagOptionBackground3n2,
},
};

const darkMode = {
Expand Down Expand Up @@ -86,6 +92,12 @@ const darkMode = {
background: Colors.Background100Dark,
compareMetricsBg: Colors.Background300Dark,
},
tagOptions: {
text: Colors.InvertedTextDark,
backgroundColorOption1: Colors.TagOptionBackground3nDark,
backgroundColorOption2: Colors.TagOptionBackground3n1Dark,
backgroundColorOption3: Colors.TagOptionBackground3n2Dark,
},
};

const getDesignTokens = (modeVal: ThemeMode) => ({
Expand Down