diff --git a/components/src/atoms/ListButton/__tests__/ListButton.test.tsx b/components/src/atoms/ListButton/__tests__/ListButton.test.tsx index fe4e3fb7349..2d65b14c61c 100644 --- a/components/src/atoms/ListButton/__tests__/ListButton.test.tsx +++ b/components/src/atoms/ListButton/__tests__/ListButton.test.tsx @@ -25,7 +25,7 @@ describe('ListButton', () => { it('should render correct style - noActive', () => { render(props) const listButton = screen.getByTestId('ListButton_noActive') - expect(listButton).toHaveStyle(`backgroundColor: ${COLORS.grey30}`) + expect(listButton).toHaveStyle(`backgroundColor: ${COLORS.grey20}`) }) it('should render correct style - connected', () => { props.type = 'connected' diff --git a/components/src/atoms/ListButton/index.tsx b/components/src/atoms/ListButton/index.tsx index 610c76bb7a9..38c1b4845c4 100644 --- a/components/src/atoms/ListButton/index.tsx +++ b/components/src/atoms/ListButton/index.tsx @@ -23,8 +23,8 @@ const LISTBUTTON_PROPS_BY_TYPE: Record< { backgroundColor: string; hoverBackgroundColor: string } > = { noActive: { - backgroundColor: COLORS.grey30, - hoverBackgroundColor: COLORS.grey35, + backgroundColor: COLORS.grey20, + hoverBackgroundColor: COLORS.grey30, }, connected: { backgroundColor: COLORS.green30, diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx index 253889423ca..bd1dfe04ed2 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx @@ -248,7 +248,7 @@ export function StepFormToolbox(props: StepFormToolboxProps): JSX.Element { numErrors, stepTypeDisplayName: i18n.format( t(`stepType.${formData.stepType}`), - 'capitalize' + 'titleCase' ), t, }) diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx index 1b6c5252917..4c8f5a18d76 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx @@ -24,6 +24,7 @@ import { Tooltip, useHoverTooltip, } from '@opentrons/components' +import { LINK_BUTTON_STYLE } from '../../../../../../atoms' import { ABSORBANCE_READER_MAX_WAVELENGTH_NM, ABSORBANCE_READER_MIN_WAVELENGTH_NM, @@ -244,6 +245,7 @@ function IntializationEditor(props: InitializationEditorProps): JSX.Element { text={t('step_edit_form.absorbanceReader.add_wavelength.label')} textAlignment="left" disabled={numWavelengths === MAX_WAVELENGTHS} + iconName="plus" /> ) : null} @@ -337,13 +339,12 @@ function WavelengthItem(props: WavelengthItemProps): JSX.Element { onClick={() => { handleDeleteWavelength(index) }} - alignSelf={ALIGN_FLEX_END} padding={SPACING.spacing4} + css={LINK_BUTTON_STYLE} + alignSelf={ALIGN_FLEX_END} + textDecoration={TEXT_DECORATION_UNDERLINE} > - + {t('step_edit_form.absorbanceReader.delete')} diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepOverflowButton.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepOverflowButton.tsx index 44b131658f7..1f539ba689e 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepOverflowButton.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/AddStepOverflowButton.tsx @@ -45,7 +45,7 @@ export function AddStepOverflowButton( {i18n.format( t(`application:stepType.${stepType}`, stepType), - 'capitalize' + 'titleCase' )} diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/ConnectedStepInfo.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/ConnectedStepInfo.tsx index 0051499bf15..e044e1e3338 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/ConnectedStepInfo.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/ConnectedStepInfo.tsx @@ -62,7 +62,7 @@ export function ConnectedStepInfo(props: ConnectedStepInfoProps): JSX.Element { setOpenedOverflowMenuId, sidebarWidth, } = props - const { t } = useTranslation('application') + const { i18n, t } = useTranslation('application') const dispatch = useDispatch>() const stepIds = useSelector(getOrderedStepIds) const step = useSelector(stepFormSelectors.getSavedStepForms)[stepId] @@ -227,7 +227,8 @@ export function ConnectedStepInfo(props: ConnectedStepInfoProps): JSX.Element { onMouseEnter={highlightStep} iconName={hasError || hasWarnings ? 'alert-circle' : iconName} title={`${stepNumber}. ${ - step.stepName || t(`stepType.${step.stepType}`) + i18n.format(step.stepName, 'titleCase') || + t(`stepType.${step.stepType}`) }`} dragHovered={dragHovered} sidebarWidth={sidebarWidth} diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/__tests__/AddStepButton.test.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/__tests__/AddStepButton.test.tsx index a2fcea0a7e2..69911628b7e 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/__tests__/AddStepButton.test.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/__tests__/AddStepButton.test.tsx @@ -87,7 +87,7 @@ describe('AddStepButton', () => { screen.getByText('Mix') screen.getByText('Pause') screen.getByText('Thermocycler') - screen.getByText('Heater-shaker') + screen.getByText('Heater-Shaker') screen.getByText('Temperature') screen.getByText('Magnet') }) diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/__tests__/ProtocolSteps.test.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/__tests__/ProtocolSteps.test.tsx index d333baf288d..32e1f090baa 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/__tests__/ProtocolSteps.test.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/__tests__/ProtocolSteps.test.tsx @@ -115,6 +115,6 @@ describe('ProtocolSteps', () => { it('renders the current step name', () => { render() - screen.getByText('Custom pause') + screen.getByText('Custom Pause') }) }) diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/index.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/index.tsx index 8ef8f52d8e8..0627ca24382 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/index.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/index.tsx @@ -120,7 +120,7 @@ export function ProtocolSteps(): JSX.Element { > {currentStep != null && hoveredTerminalItem == null ? ( - {i18n.format(currentStep.stepName, 'capitalize')} + {i18n.format(currentStep.stepName, 'titleCase')} ) : null} {(hoveredTerminalItem != null || selectedTerminalItem != null) &&