diff --git a/protocol-designer/src/atoms/constants.ts b/protocol-designer/src/atoms/constants.ts index 67393baafd9..31fd22da638 100644 --- a/protocol-designer/src/atoms/constants.ts +++ b/protocol-designer/src/atoms/constants.ts @@ -6,13 +6,6 @@ import { } from '@opentrons/components' import type { FlattenSimpleInterpolation } from 'styled-components' -export const BUTTON_LINK_STYLE = css` - color: ${COLORS.grey60}; - &:hover { - color: ${COLORS.grey40}; - } -` - export const LINK_BUTTON_STYLE = css` color: ${COLORS.black90}; diff --git a/protocol-designer/src/organisms/Alerts/ErrorContents.tsx b/protocol-designer/src/organisms/Alerts/ErrorContents.tsx index 73dfa60f995..8320ae8ec1b 100644 --- a/protocol-designer/src/organisms/Alerts/ErrorContents.tsx +++ b/protocol-designer/src/organisms/Alerts/ErrorContents.tsx @@ -7,7 +7,7 @@ import { SPACING, TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { selectDesignerTab } from '../../file-data/actions' import type { AlertLevel } from './types' @@ -38,7 +38,7 @@ export const ErrorContents = ( { dispatch(selectDesignerTab({ tab: 'startingDeck' })) }} @@ -58,7 +58,7 @@ export const ErrorContents = ( { dispatch(selectDesignerTab({ tab: 'startingDeck' })) }} diff --git a/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx b/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx index 0140abf8e70..5de4843883c 100644 --- a/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx +++ b/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx @@ -64,7 +64,7 @@ import { setFeatureFlags } from '../../feature-flags/actions' import { createCustomTiprackDef } from '../../labware-defs/actions' import { deleteContainer } from '../../labware-ingred/actions' import { selectors as stepFormSelectors } from '../../step-forms' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { getMainPagePortalEl } from '../Portal' import { getSectionsFromPipetteName, @@ -236,7 +236,7 @@ export function EditInstrumentsModal( {has96Channel || (leftPipette == null && rightPipette == null) ? null : ( dispatch( changeSavedStepForm({ @@ -354,7 +354,7 @@ export function EditInstrumentsModal( @@ -80,7 +80,7 @@ export function PipetteInfoItem(props: PipetteInfoItemProps): JSX.Element { cleanForm() }} textDecoration={TYPOGRAPHY.textDecorationUnderline} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} padding={SPACING.spacing4} > diff --git a/protocol-designer/src/organisms/TipPositionModal/ZTipPositionModal.tsx b/protocol-designer/src/organisms/TipPositionModal/ZTipPositionModal.tsx index 7809a976313..81fb4ab3c2d 100644 --- a/protocol-designer/src/organisms/TipPositionModal/ZTipPositionModal.tsx +++ b/protocol-designer/src/organisms/TipPositionModal/ZTipPositionModal.tsx @@ -17,7 +17,7 @@ import { } from '@opentrons/components' import { DEFAULT_MM_BLOWOUT_OFFSET_FROM_TOP } from '../../constants' import { getIsTouchTipField } from '../../form-types' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { getMainPagePortalEl } from '../Portal' import * as utils from './utils' import { TOO_MANY_DECIMALS } from './constants' @@ -156,7 +156,7 @@ export function ZTipPositionModal(props: ZTipPositionModalProps): JSX.Element { onClick={() => { setValue(utils.roundValue(defaultMm, 'up').toString()) }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {t('shared:reset_to_default')} diff --git a/protocol-designer/src/organisms/TipPositionModal/index.tsx b/protocol-designer/src/organisms/TipPositionModal/index.tsx index cdef7a6855b..cb06f4c2fc8 100644 --- a/protocol-designer/src/organisms/TipPositionModal/index.tsx +++ b/protocol-designer/src/organisms/TipPositionModal/index.tsx @@ -18,7 +18,7 @@ import { TYPOGRAPHY, } from '@opentrons/components' import { getIsTouchTipField } from '../../form-types' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { getMainPagePortalEl } from '../Portal' import { TOO_MANY_DECIMALS, PERCENT_RANGE_TO_SHOW_WARNING } from './constants' import * as utils from './utils' @@ -257,7 +257,7 @@ export function TipPositionModal( setYValue('0') setZValue('1') }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {t('shared:reset_to_default')} @@ -331,7 +331,7 @@ export function TipPositionModal( { setView(view === 'side' ? 'top' : 'side') }} diff --git a/protocol-designer/src/organisms/WellOrderModal/index.tsx b/protocol-designer/src/organisms/WellOrderModal/index.tsx index b7b181f6a72..54b4ad437ef 100644 --- a/protocol-designer/src/organisms/WellOrderModal/index.tsx +++ b/protocol-designer/src/organisms/WellOrderModal/index.tsx @@ -14,7 +14,7 @@ import { DropdownMenu, ALIGN_CENTER, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { getMainPagePortalEl } from '../Portal' import { WellOrderVisualization } from './WellOrderVisualization' import type { WellOrderOption } from '../../form-types' @@ -164,7 +164,7 @@ export function WellOrderModal(props: WellOrderModalProps): JSX.Element | null { padding={`0 ${SPACING.spacing24} ${SPACING.spacing24}`} alignItems={ALIGN_CENTER} > - + {t('shared:reset_to_default')} diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx index bae902d4153..ff96f699267 100644 --- a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx +++ b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx @@ -38,7 +38,7 @@ import { setFeatureFlags } from '../../feature-flags/actions' import { createCustomTiprackDef } from '../../labware-defs/actions' import { useKitchen } from '../../organisms/Kitchen/hooks' import { IncompatibleTipsModal, PipetteInfoItem } from '../../organisms' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { WizardBody } from './WizardBody' import { PIPETTE_GENS, PIPETTE_TYPES, PIPETTE_VOLUMES } from './constants' import { getTiprackOptions } from './utils' @@ -450,7 +450,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null { (pipettesByMount.left.tiprackDefURI == null && pipettesByMount.right.tiprackDefURI == null) ? null : ( { const leftPipetteName = pipettesByMount.left.pipetteName const rightPipetteName = pipettesByMount.right.pipetteName diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/WizardBody.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/WizardBody.tsx index d0c9c57cb37..54a629120a9 100644 --- a/protocol-designer/src/pages/CreateNewProtocolWizard/WizardBody.tsx +++ b/protocol-designer/src/pages/CreateNewProtocolWizard/WizardBody.tsx @@ -25,7 +25,7 @@ import three from '../../assets/images/onboarding_animation_3.webm' import four from '../../assets/images/onboarding_animation_4.webm' import five from '../../assets/images/onboarding_animation_5.webm' import six from '../../assets/images/onboarding_animation_6.webm' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import type { RobotType } from '@opentrons/shared-data' interface WizardBodyProps { @@ -144,7 +144,7 @@ export function WizardBody(props: WizardBodyProps): JSX.Element { alignItems={ALIGN_CENTER} > {goBack != null ? ( - + {t('go_back')} diff --git a/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx b/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx index c498a71534c..f5b1fe252cd 100644 --- a/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx +++ b/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx @@ -55,7 +55,7 @@ import { selectors } from '../../../labware-ingred/selectors' import { useKitchen } from '../../../organisms/Kitchen/hooks' import { getDismissedHints } from '../../../tutorial/selectors' import { createContainerAboveModule } from '../../../step-forms/actions/thunks' -import { BUTTON_LINK_STYLE, NAV_BAR_HEIGHT_REM } from '../../../atoms' +import { LINK_BUTTON_STYLE, NAV_BAR_HEIGHT_REM } from '../../../atoms' import { ConfirmDeleteStagingAreaModal } from '../../../organisms' import { getSlotInformation } from '../utils' import { ALL_ORDERED_CATEGORIES, FIXTURES, MOAM_MODELS } from './constants' @@ -438,7 +438,7 @@ export function DeckSetupTools(props: DeckSetupToolsProps): JSX.Element | null { handleResetToolbox() } }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} textDecoration={TYPOGRAPHY.textDecorationUnderline} > diff --git a/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx b/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx index ca8feac72d1..d41f2057502 100644 --- a/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx +++ b/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx @@ -32,7 +32,7 @@ import { getModuleType, } from '@opentrons/shared-data' -import { BUTTON_LINK_STYLE } from '../../../atoms' +import { LINK_BUTTON_STYLE } from '../../../atoms' import { selectors as stepFormSelectors } from '../../../step-forms' import { getOnlyLatestDefs } from '../../../labware-defs' import { @@ -491,7 +491,7 @@ export function LabwareTools(props: LabwareToolsProps): JSX.Element { alignItems={ALIGN_CENTER} justifyContent={JUSTIFY_CENTER} > - + {t('upload_custom_labware')} diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx index 307e9e4aeac..475340bf2d4 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx @@ -18,7 +18,7 @@ import { } from '@opentrons/components' import { stepIconsByType } from '../../../../form-types' import { - BUTTON_LINK_STYLE, + LINK_BUTTON_STYLE, LINE_CLAMP_TEXT_STYLE, NAV_BAR_HEIGHT_REM, } from '../../../../atoms' @@ -299,7 +299,7 @@ export function StepFormToolbox(props: StepFormToolboxProps): JSX.Element { onClick={() => { setIsRename(true) }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} textDecoration={TYPOGRAPHY.textDecorationUnderline} > diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerCycle.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerCycle.tsx index 9c0e356c158..96d0007e096 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerCycle.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerCycle.tsx @@ -20,7 +20,7 @@ import { StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../../../../../atoms' +import { LINK_BUTTON_STYLE } from '../../../../../../atoms' import { isTimeFormatMinutesSeconds, temperatureRangeFieldValue, @@ -262,7 +262,7 @@ export function ThermocyclerCycle(props: ThermocyclerCycleProps): JSX.Element { whiteSpace={NO_WRAP} textDecoration={TYPOGRAPHY.textDecorationUnderline} padding={SPACING.spacing4} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {i18n.format( @@ -329,7 +329,7 @@ export function ThermocyclerCycle(props: ThermocyclerCycleProps): JSX.Element { }} padding={SPACING.spacing4} css={[ - BUTTON_LINK_STYLE, + LINK_BUTTON_STYLE, css` visibility: ${hover ? 'visible' : 'hidden'}; opacity: ${hover ? 1 : 0}; @@ -527,7 +527,7 @@ export function ThermocyclerCycle(props: ThermocyclerCycleProps): JSX.Element { whiteSpace={NO_WRAP} textDecoration={TYPOGRAPHY.textDecorationUnderline} padding={SPACING.spacing4} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {i18n.format( diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerStep.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerStep.tsx index 22dda2fc368..3e45704c94d 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerStep.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/ThermocyclerTools/ThermocyclerStep.tsx @@ -18,7 +18,7 @@ import { StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../../../../../atoms' +import { LINK_BUTTON_STYLE } from '../../../../../../atoms' import { temperatureRangeFieldValue, isTimeFormatMinutesSeconds, @@ -160,7 +160,7 @@ export function ThermocyclerStep(props: ThermocyclerStepProps): JSX.Element { whiteSpace={NO_WRAP} textDecoration={TYPOGRAPHY.textDecorationUnderline} padding={SPACING.spacing4} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {i18n.format( @@ -221,7 +221,7 @@ export function ThermocyclerStep(props: ThermocyclerStepProps): JSX.Element { }} padding={SPACING.spacing4} css={[ - BUTTON_LINK_STYLE, + LINK_BUTTON_STYLE, css` visibility: ${hover ? 'visible' : 'hidden'}; opacity: ${hover ? 1 : 0}; diff --git a/protocol-designer/src/pages/Landing/index.tsx b/protocol-designer/src/pages/Landing/index.tsx index a1ca26b867c..48d2eb27ead 100644 --- a/protocol-designer/src/pages/Landing/index.tsx +++ b/protocol-designer/src/pages/Landing/index.tsx @@ -17,7 +17,7 @@ import { StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { AnnouncementModal } from '../../organisms' import { actions as loadFileActions } from '../../load-file' import { getFileMetadata } from '../../file-data/selectors' @@ -137,7 +137,7 @@ export function Landing(): JSX.Element { /> - + {t('edit_existing')} diff --git a/protocol-designer/src/pages/ProtocolOverview/InstrumentsInfo.tsx b/protocol-designer/src/pages/ProtocolOverview/InstrumentsInfo.tsx index 63ce567a805..ee40f77aef4 100644 --- a/protocol-designer/src/pages/ProtocolOverview/InstrumentsInfo.tsx +++ b/protocol-designer/src/pages/ProtocolOverview/InstrumentsInfo.tsx @@ -14,7 +14,7 @@ import { } from '@opentrons/components' import { getPipetteSpecsV2, FLEX_ROBOT_TYPE } from '@opentrons/shared-data' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import type { PipetteName, RobotType } from '@opentrons/shared-data' import type { AdditionalEquipmentEntities } from '@opentrons/step-generation' @@ -87,7 +87,7 @@ export function InstrumentsInfo({ onClick={() => { setShowEditInstrumentsModal(true) }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {t('edit')} diff --git a/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx b/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx index d750edaaad5..564c99d9f89 100644 --- a/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx +++ b/protocol-designer/src/pages/ProtocolOverview/ProtocolMetadata.tsx @@ -12,7 +12,7 @@ import { TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE, LINE_CLAMP_TEXT_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE, LINE_CLAMP_TEXT_STYLE } from '../../atoms' const REQUIRED_APP_VERSION = '8.2.0' @@ -46,7 +46,7 @@ export function ProtocolMetadata({ onClick={() => { setShowEditMetadataModal(true) }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} data-testid="ProtocolOverview_MetadataEditButton" > diff --git a/protocol-designer/src/pages/ProtocolOverview/StartingDeck.tsx b/protocol-designer/src/pages/ProtocolOverview/StartingDeck.tsx index 8dac5003b6f..48e3cb178b4 100644 --- a/protocol-designer/src/pages/ProtocolOverview/StartingDeck.tsx +++ b/protocol-designer/src/pages/ProtocolOverview/StartingDeck.tsx @@ -15,7 +15,7 @@ import { TYPOGRAPHY, } from '@opentrons/components' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { SlotDetailsContainer } from '../../organisms' import { getInitialDeckSetup } from '../../step-forms/selectors' import { DeckThumbnail } from './DeckThumbnail' @@ -72,7 +72,7 @@ function StartingDeckHeader(props: StartingDeckHeaderProps): JSX.Element { onClick={() => { setShowMaterialsListModal(true) }} - css={BUTTON_LINK_STYLE} + css={LINK_BUTTON_STYLE} > {t('protocol_overview:materials_list')} diff --git a/protocol-designer/src/pages/Settings/index.tsx b/protocol-designer/src/pages/Settings/index.tsx index 63519226a92..fa364525f99 100644 --- a/protocol-designer/src/pages/Settings/index.tsx +++ b/protocol-designer/src/pages/Settings/index.tsx @@ -27,7 +27,7 @@ import { selectors as tutorialSelectors, } from '../../tutorial' import { ToggleButton } from '../../atoms/ToggleButton' -import { BUTTON_LINK_STYLE } from '../../atoms' +import { LINK_BUTTON_STYLE } from '../../atoms' import { actions as featureFlagActions } from '../../feature-flags' import { getFeatureFlagData } from '../../feature-flags/selectors' import type { FlagTypes } from '../../feature-flags' @@ -142,7 +142,7 @@ export function Settings(): JSX.Element { { setShowAnnouncementModal(true) diff --git a/yarn.lock b/yarn.lock index 56ebcbf301a..d58c1ef61ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22739,7 +22739,7 @@ vitest-when@0.5.0: dependencies: pretty-format "^29.7.0" -vitest@^2.1.8: +vitest@2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.1.8.tgz#2e6a00bc24833574d535c96d6602fb64163092fa" integrity sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==