Skip to content

Commit

Permalink
fix(app): update toggle group, overflow btn, historical protocol run …
Browse files Browse the repository at this point in the history
…colors (#14532)

updates to helix colors to close tickets RAUT-978, RAUT-982, RAUT-989
  • Loading branch information
brenthagen authored Feb 21, 2024
1 parent 7b456ed commit 0e1c02b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/src/atoms/MenuList/OverflowBtn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const OverflowBtn = React.forwardRef(
background-color: ${COLORS.grey30};
}
&:hover circle {
fill: ${COLORS.black90};
fill: ${COLORS.grey55};
}
&:active,
Expand All @@ -31,7 +31,7 @@ export const OverflowBtn = React.forwardRef(
}
&:focus-visible {
box-shadow: ${`0 0 0 3px ${COLORS.blue50}`};
box-shadow: ${`0 0 0 3px ${COLORS.yellow50}`};
background-color: ${'transparent'};
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/atoms/MenuList/__tests__/OverflowBtn.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('OverflowBtn', () => {

expect(getByRole('button')).toHaveStyleRule(
'box-shadow',
`0 0 0 3px ${String(COLORS.blue50)}`,
`0 0 0 3px ${String(COLORS.yellow50)}`,
{
modifier: ':focus-visible',
}
Expand Down
1 change: 1 addition & 0 deletions app/src/molecules/ToggleGroup/useToggleGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const BUTTON_GROUP_STYLES = css`
&:focus {
box-shadow: none;
color: ${COLORS.white};
background-color: ${COLORS.blue50};
}
&:hover {
Expand Down
4 changes: 4 additions & 0 deletions app/src/organisms/Devices/HistoricalProtocolRun.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export function HistoricalProtocolRun(
css={css`
cursor: pointer;
`}
color={COLORS.grey60}
>
{runDisplayName}
</StyledText>
Expand All @@ -107,6 +108,7 @@ export function HistoricalProtocolRun(
onClick={() => history.push(`/protocols/${protocolKey}`)}
css={CLICK_STYLE}
marginRight={SPACING.spacing16}
color={COLORS.grey60}
>
{protocolName}
</StyledText>
Expand All @@ -117,6 +119,7 @@ export function HistoricalProtocolRun(
data-testid={`RecentProtocolRuns_Protocol_${String(protocolKey)}`}
overflowWrap={OVERFLOW_WRAP_ANYWHERE}
marginRight={SPACING.spacing16}
color={COLORS.grey60}
>
{protocolName}
</StyledText>
Expand All @@ -126,6 +129,7 @@ export function HistoricalProtocolRun(
width="20%"
textTransform="capitalize"
data-testid={`RecentProtocolRuns_Status_${String(protocolKey)}`}
color={COLORS.grey60}
>
{runStatus === 'running' && (
<Icon
Expand Down

0 comments on commit 0e1c02b

Please sign in to comment.