diff --git a/app/src/atoms/InstrumentContainer/index.tsx b/app/src/atoms/InstrumentContainer/index.tsx
index 857411c3c72..0effcea81bb 100644
--- a/app/src/atoms/InstrumentContainer/index.tsx
+++ b/app/src/atoms/InstrumentContainer/index.tsx
@@ -16,7 +16,7 @@ export const InstrumentContainer = (
return (
{
props.disabled = true
const { getByLabelText } = render(props)
const button = getByLabelText('toggle button')
- expect(button).toHaveStyleRule('color', `${String(COLORS.grey40)}`, {
+ expect(button).toHaveStyleRule('color', `${String(COLORS.grey30)}`, {
modifier: ':disabled',
})
})
@@ -73,7 +73,7 @@ describe('ToggleButton', () => {
props.toggledOn = false
const { getByLabelText } = render(props)
const button = getByLabelText('toggle button')
- expect(button).toHaveStyle(`color: ${String(COLORS.grey60)}`)
+ expect(button).toHaveStyle(`color: ${String(COLORS.grey50)}`)
expect(button).toHaveStyle(`height: ${String(SIZE_2)}`)
expect(button).toHaveStyle(`width: ${String(SIZE_2)}`)
expect(button).toHaveAttribute('aria-checked', 'false')
@@ -106,7 +106,7 @@ describe('ToggleButton', () => {
props.disabled = true
const { getByLabelText } = render(props)
const button = getByLabelText('toggle button')
- expect(button).toHaveStyleRule('color', `${String(COLORS.grey40)}`, {
+ expect(button).toHaveStyleRule('color', `${String(COLORS.grey30)}`, {
modifier: ':disabled',
})
})
diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx
index 29b6e54737b..1fe0a486b09 100644
--- a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx
+++ b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx
@@ -120,7 +120,7 @@ export function LiquidsListItem(props: LiquidsListItemProps): JSX.Element {
border: 1px solid ${COLORS.white};
&:hover {
cursor: pointer;
- ${BORDERS.cardOutlineBorder}
+ border: 1px solid ${COLORS.grey30};
}
`
const handleSetOpenItem = (): void => {
diff --git a/app/src/organisms/DropTipWizard/BeforeBeginning.tsx b/app/src/organisms/DropTipWizard/BeforeBeginning.tsx
index bfc44c5cd06..8fe2d7970cd 100644
--- a/app/src/organisms/DropTipWizard/BeforeBeginning.tsx
+++ b/app/src/organisms/DropTipWizard/BeforeBeginning.tsx
@@ -186,7 +186,7 @@ export const BeforeBeginning = (
const UNSELECTED_OPTIONS_STYLE = css`
background-color: ${COLORS.white};
- border: 1px solid ${COLORS.grey20};
+ border: 1px solid ${COLORS.grey30};
border-radius: ${BORDERS.radiusSoftCorners};
height: 12.5625rem;
width: 14.5625rem;
@@ -197,7 +197,7 @@ const UNSELECTED_OPTIONS_STYLE = css`
grid-gap: ${SPACING.spacing8};
&:hover {
- border: 1px solid ${COLORS.grey30};
+ border: 1px solid ${COLORS.grey35};
}
@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
diff --git a/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx b/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx
index d467ca90c0a..ee0a2bca0b3 100644
--- a/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx
+++ b/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx
@@ -74,7 +74,7 @@ export const ProtocolLiquidsDetails = (
flexDirection={DIRECTION_COLUMN}
>
diff --git a/app/src/organisms/ProtocolDetails/index.tsx b/app/src/organisms/ProtocolDetails/index.tsx
index b7ecd353f6d..51cd618f7de 100644
--- a/app/src/organisms/ProtocolDetails/index.tsx
+++ b/app/src/organisms/ProtocolDetails/index.tsx
@@ -425,7 +425,7 @@ export function ProtocolDetails(
flexDirection={DIRECTION_COLUMN}
data-testid="ProtocolDetails_creationMethod"
>
-
+
{t('creation_method')}
@@ -438,7 +438,7 @@ export function ProtocolDetails(
flexDirection={DIRECTION_COLUMN}
data-testid="ProtocolDetails_lastUpdated"
>
-
+
{t('last_updated')}
@@ -451,7 +451,7 @@ export function ProtocolDetails(
flexDirection={DIRECTION_COLUMN}
data-testid="ProtocolDetails_lastAnalyzed"
>
-
+
{t('last_analyzed')}
@@ -481,7 +481,7 @@ export function ProtocolDetails(
flexDirection={DIRECTION_COLUMN}
data-testid="ProtocolDetails_author"
>
-
+
{t('org_or_author')}
-
+
{t('description')}
{analysisStatus === 'loading' ? (
@@ -567,7 +567,7 @@ export function ProtocolDetails(
color={
analysisStatus !== 'complete'
? COLORS.grey40
- : COLORS.grey50
+ : COLORS.grey60
}
/>
diff --git a/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx b/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx
index 24515106f6c..ab37ec6c37f 100644
--- a/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx
+++ b/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx
@@ -168,8 +168,22 @@ function AnalysisInfo(props: AnalysisInfoProps): JSX.Element {
>
{
{
- missing: ,
- loading: ,
+ missing: (
+
+ ),
+ loading: (
+
+ ),
error: ,
stale: ,
complete:
@@ -208,7 +222,7 @@ function AnalysisInfo(props: AnalysisInfoProps): JSX.Element {
{/* data section */}
{analysisStatus === 'loading' ? (
-
+
{t('loading_data')}
) : (
@@ -303,7 +317,7 @@ function AnalysisInfo(props: AnalysisInfoProps): JSX.Element {
justifyContent={JUSTIFY_FLEX_END}
data-testid={`ProtocolCard_date_${protocolDisplayName}`}
>
-
+
{`${t('updated')} ${format(
new Date(modified),
'M/d/yy HH:mm'
diff --git a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx
index e50032fa217..e765086c29e 100644
--- a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx
+++ b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx
@@ -42,7 +42,7 @@ const SORT_BY_BUTTON_STYLE = css`
background-color: ${COLORS.transparent};
cursor: pointer;
&:hover {
- background-color: ${COLORS.grey60};
+ background-color: ${COLORS.grey30};
}
&:active,
&:focus {
@@ -161,7 +161,7 @@ export function ProtocolList(props: ProtocolListProps): JSX.Element | null {
{t('shared:sort_by')}
diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx
index c26e3b5c8b3..605db840cc9 100644
--- a/app/src/organisms/RunPreview/index.tsx
+++ b/app/src/organisms/RunPreview/index.tsx
@@ -95,9 +95,8 @@ export const RunPreviewComponent = (
>
{(command, index) => {
const isCurrent = index === currentRunCommandIndex
- const borderColor = isCurrent ? COLORS.blue50 : COLORS.transparent
- const backgroundColor = isCurrent ? COLORS.blue30 : COLORS.grey10
- const contentColor = isCurrent ? COLORS.blue60 : COLORS.grey50
+ const backgroundColor = isCurrent ? COLORS.blue30 : COLORS.grey20
+ const iconColor = isCurrent ? COLORS.blue60 : COLORS.grey50
return (
-
+
diff --git a/app/src/organisms/RunProgressMeter/index.tsx b/app/src/organisms/RunProgressMeter/index.tsx
index cc54fb5562f..33e361acba9 100644
--- a/app/src/organisms/RunProgressMeter/index.tsx
+++ b/app/src/organisms/RunProgressMeter/index.tsx
@@ -230,7 +230,11 @@ export function RunProgressMeter(props: RunProgressMeterProps): JSX.Element {
textTransform={TYPOGRAPHY.textTransformCapitalize}
onClick={onDownloadClick}
>
-
+
{t('download_run_log')}
@@ -259,7 +263,7 @@ export function RunProgressMeter(props: RunProgressMeterProps): JSX.Element {
`}
innerStyles={css`
height: 0.375rem;
- background-color: ${COLORS.grey50};
+ background-color: ${COLORS.grey60};
border-radius: ${BORDERS.radiusSoftCorners};
`}
>
diff --git a/app/src/organisms/TaskList/index.tsx b/app/src/organisms/TaskList/index.tsx
index 3cfd0225d43..9f2351330a6 100644
--- a/app/src/organisms/TaskList/index.tsx
+++ b/app/src/organisms/TaskList/index.tsx
@@ -218,7 +218,11 @@ function SubTask({
backgroundColor={isActiveSubTask ? COLORS.blue10 : COLORS.white}
justifyContent={JUSTIFY_SPACE_BETWEEN}
padding={SPACING.spacing16}
- border={isActiveSubTask ? BORDERS.activeLineBorder : TASK_CONNECTOR_STYLE}
+ border={
+ isActiveSubTask
+ ? BORDERS.activeLineBorder
+ : `1px solid ${COLORS.grey30}`
+ }
borderRadius={BORDERS.radiusSoftCorners}
gridGap={SPACING.spacing24}
width="100%"
diff --git a/components/src/atoms/buttons/SecondaryButton.tsx b/components/src/atoms/buttons/SecondaryButton.tsx
index 5b624e60363..00e456ba100 100644
--- a/components/src/atoms/buttons/SecondaryButton.tsx
+++ b/components/src/atoms/buttons/SecondaryButton.tsx
@@ -13,7 +13,7 @@ export const SecondaryButton = styled.button.withConfig({
})`
appearance: none;
cursor: pointer;
- color: ${props => (props.isDangerous ? COLORS.red60 : COLORS.blue50)};
+ color: ${props => (props.isDangerous ? COLORS.red50 : COLORS.blue50)};
border: ${BORDERS.lineBorder};
border-color: ${props => (props.isDangerous ? COLORS.red50 : 'initial')};
border-radius: ${BORDERS.radiusSoftCorners};
@@ -28,7 +28,7 @@ export const SecondaryButton = styled.button.withConfig({
}
&:hover {
- color: ${props => (props.isDangerous ? COLORS.red60 : COLORS.blue60)};
+ color: ${props => (props.isDangerous ? COLORS.red50 : COLORS.blue60)};
border-color: ${props =>
props.isDangerous ? COLORS.red50 : COLORS.blue55};
box-shadow: 0 0 0;
@@ -45,7 +45,7 @@ export const SecondaryButton = styled.button.withConfig({
box-shadow: none;
color: ${props => (props.isDangerous ? COLORS.red60 : COLORS.blue55)};
border-color: ${props =>
- props.isDangerous ? COLORS.red50 : COLORS.blue55};
+ props.isDangerous ? COLORS.red60 : COLORS.blue55};
}
&:disabled,
diff --git a/components/src/helix-design-system/colors.ts b/components/src/helix-design-system/colors.ts
index c03b646af83..342d32f9273 100644
--- a/components/src/helix-design-system/colors.ts
+++ b/components/src/helix-design-system/colors.ts
@@ -59,7 +59,7 @@ export const blue10 = '#F1F8FF'
* grey
*/
export const grey60 = '#4A4C4E'
-export const grey55 = '#737578'
+export const grey55 = '#626467'
export const grey50 = '#737578'
export const grey40 = '#B7B8B9'
export const grey35 = '#CBCCCC'