From f8475767a451ada9578d2fe27c08a853e7d4f19d Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 10:42:16 -0500 Subject: [PATCH 01/10] update run summary colors --- app/src/organisms/RunPreview/index.tsx | 10 +++------- app/src/organisms/RunProgressMeter/index.tsx | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx index c26e3b5c8b3..5ec47bac81e 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 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..573adb5ecd1 100644 --- a/app/src/organisms/RunProgressMeter/index.tsx +++ b/app/src/organisms/RunProgressMeter/index.tsx @@ -259,7 +259,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}; `} > From d19e43c98e234dc9636325e8f70bedfd0fe18663 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 10:42:28 -0500 Subject: [PATCH 02/10] update ProtocolList hover state --- app/src/organisms/ProtocolsLanding/ProtocolList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx index e50032fa217..fabd2e9d26c 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 { From 743c24b53e7728ac87ffc6abc375cfb467f8a7f9 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 10:54:25 -0500 Subject: [PATCH 03/10] update protocol setup colors --- app/src/organisms/RunPreview/index.tsx | 2 +- app/src/organisms/RunProgressMeter/index.tsx | 6 +++++- components/src/atoms/buttons/SecondaryButton.tsx | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx index 5ec47bac81e..605db840cc9 100644 --- a/app/src/organisms/RunPreview/index.tsx +++ b/app/src/organisms/RunPreview/index.tsx @@ -95,7 +95,7 @@ export const RunPreviewComponent = ( > {(command, index) => { const isCurrent = index === currentRunCommandIndex - const backgroundColor = isCurrent ? COLORS.blue30 : COLORS.grey10 + const backgroundColor = isCurrent ? COLORS.blue30 : COLORS.grey20 const iconColor = isCurrent ? COLORS.blue60 : COLORS.grey50 return ( - + {t('download_run_log')} 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, From 595a04b5acd9a265617188d69d8fb870e8ec53a5 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 11:06:30 -0500 Subject: [PATCH 04/10] update protocoldetail page colors --- .../ProtocolDetails/ProtocolLiquidsDetails.tsx | 2 +- .../ProtocolDetails/RobotConfigurationDetails.tsx | 4 ++-- app/src/organisms/ProtocolDetails/index.tsx | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) 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 } /> From 7592191a598349870875a0d17698686ca4f4efc2 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 12:03:41 -0500 Subject: [PATCH 05/10] update protocols page colors --- .../ProtocolsLanding/ProtocolCard.tsx | 22 +++++++++++++++---- .../ProtocolsLanding/ProtocolList.tsx | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) 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 fabd2e9d26c..e765086c29e 100644 --- a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx +++ b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx @@ -161,7 +161,7 @@ export function ProtocolList(props: ProtocolListProps): JSX.Element | null { {t('shared:sort_by')} From fcb58473e46dd9062f8d21ab5385a96288c33282 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 13:29:14 -0500 Subject: [PATCH 06/10] update drop tip unselected border states --- app/src/organisms/DropTipWizard/BeforeBeginning.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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} { From e6645f95ce381e2f5ff2d7c2cba253452776add9 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 15:14:34 -0500 Subject: [PATCH 07/10] mel feedback --- app/src/atoms/InstrumentContainer/index.tsx | 2 +- app/src/atoms/buttons/ToggleButton.tsx | 4 ++-- app/src/organisms/TaskList/index.tsx | 6 +++++- components/src/helix-design-system/colors.ts | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) 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 ( Date: Wed, 21 Feb 2024 16:47:14 -0500 Subject: [PATCH 08/10] update toggle states --- app/src/atoms/buttons/ToggleButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/atoms/buttons/ToggleButton.tsx b/app/src/atoms/buttons/ToggleButton.tsx index 203336ebf14..5299e332845 100644 --- a/app/src/atoms/buttons/ToggleButton.tsx +++ b/app/src/atoms/buttons/ToggleButton.tsx @@ -33,7 +33,7 @@ const TOGGLE_ENABLED_STYLES = css` } &:disabled { - color: ${COLORS.grey40}; + color: ${COLORS.grey30}; } ` From 3acc39c027a6f4c8f3ca1085ba07f27c0b10f7b8 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 17:48:16 -0500 Subject: [PATCH 09/10] update liquid card item border to grey30 on hover --- .../Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 => { From f5e7c36c337e4999e2e59811cc5725ad4c2d1613 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Wed, 21 Feb 2024 17:53:25 -0500 Subject: [PATCH 10/10] test fix --- app/src/atoms/buttons/__tests__/ToggleButton.test.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/atoms/buttons/__tests__/ToggleButton.test.tsx b/app/src/atoms/buttons/__tests__/ToggleButton.test.tsx index 2139edfa873..5cfc9ba383a 100644 --- a/app/src/atoms/buttons/__tests__/ToggleButton.test.tsx +++ b/app/src/atoms/buttons/__tests__/ToggleButton.test.tsx @@ -57,7 +57,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', }) }) @@ -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', }) })