diff --git a/components/src/atoms/ListItem/ListItemChildren/ListItemCustomize.tsx b/components/src/atoms/ListItem/ListItemChildren/ListItemCustomize.tsx index b329b2fdc78..31df0c09b4b 100644 --- a/components/src/atoms/ListItem/ListItemChildren/ListItemCustomize.tsx +++ b/components/src/atoms/ListItem/ListItemChildren/ListItemCustomize.tsx @@ -33,7 +33,7 @@ export function ListItemCustomize(props: ListItemCustomizeProps): JSX.Element { } = props return ( - + {leftHeaderItem != null ? ( {leftHeaderItem} ) : null} diff --git a/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO.png b/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO.png new file mode 100644 index 00000000000..f8ecfcc4f9c Binary files /dev/null and b/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO.png differ diff --git a/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO_crop.png b/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO_crop.png new file mode 100644 index 00000000000..faa27a6f802 Binary files /dev/null and b/protocol-designer/src/assets/images/modules/MagneticBlock_GEN1_HERO_crop.png differ diff --git a/protocol-designer/src/assets/images/modules/magnetic_block_gen_1.png b/protocol-designer/src/assets/images/modules/magnetic_block_gen_1.png new file mode 100644 index 00000000000..f6619384a79 Binary files /dev/null and b/protocol-designer/src/assets/images/modules/magnetic_block_gen_1.png differ diff --git a/protocol-designer/src/components/modules/ModuleDiagram.tsx b/protocol-designer/src/components/modules/ModuleDiagram.tsx index bdfbfbb44bb..0085b418ab2 100644 --- a/protocol-designer/src/components/modules/ModuleDiagram.tsx +++ b/protocol-designer/src/components/modules/ModuleDiagram.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import styles from './styles.module.css' +import { css } from 'styled-components' import { MAGNETIC_MODULE_TYPE, TEMPERATURE_MODULE_TYPE, @@ -25,7 +25,9 @@ import temp_deck_gen_2_transparent from '../../assets/images/modules/temp_deck_g import thermocycler from '../../assets/images/modules/thermocycler.png' import thermocycler_gen2 from '../../assets/images/modules/thermocycler_gen2.png' import heater_shaker_module_transparent from '../../assets/images/modules/heater_shaker_module_transparent.png' -import mag_block from '../../assets/images/modules/mag_block.png' +// import mag_block from '../../assets/images/modules/mag_block.png' +// import mag_block from '../../assets/images/modules/MagneticBlock_GEN1_HERO_crop.png' +import mag_block from '../../assets/images/modules/magnetic_block_gen_1.png' import type { ModuleType, ModuleModel } from '@opentrons/shared-data' interface Props { @@ -64,7 +66,18 @@ const MODULE_IMG_BY_TYPE: ModuleImg = { }, } +const IMAGE_MAX_WIDTH = '96px' export function ModuleDiagram(props: Props): JSX.Element { const model = MODULE_IMG_BY_TYPE[props.type][props.model] - return {props.type} + return ( + {props.type} + ) } diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx index 012be6026c3..b2696dbe70f 100644 --- a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx +++ b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx @@ -2,6 +2,9 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { + ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, EmptySelectorButton, Flex, @@ -262,10 +265,17 @@ export function SelectModules(props: WizardTileProps): JSX.Element | null { }} header={getModuleDisplayName(module.model)} leftHeaderItem={ - + + + } /> diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx index 6f95166d268..da8e5054b28 100644 --- a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx +++ b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx @@ -20,6 +20,7 @@ import { Flex, Icon, JUSTIFY_SPACE_BETWEEN, + OVERFLOW_AUTO, PRODUCT, RadioButton, SPACING, @@ -137,7 +138,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {