Skip to content

Commit a6255d4

Browse files
authored
fix(app): fix the background styling for svgs in slot details (#20301)
* fix(app): fix the background styling for svgs in slot details
1 parent fd6a8d7 commit a6255d4

File tree

25 files changed

+404
-247
lines changed

25 files changed

+404
-247
lines changed

app/src/organisms/Desktop/ProtocolVisualization/LabwareSlotContainer.tsx renamed to app/src/organisms/Desktop/ProtocolVisualization/LabwareSlotContainer/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import {
1515
wellFillFromWellContents,
1616
} from '@opentrons/step-generation'
1717

18+
import { getAllWellContentsAtFrame } from '../utils/getAllWellContentsAtFrame'
19+
import { WellContainer } from '../WellContainer'
20+
import { WellTooltip } from '../WellTooltip'
1821
import styles from './labwareslotcontainer.module.css'
19-
import { getAllWellContentsAtFrame } from './utils/getAllWellContentsAtFrame'
20-
import { WellContainer } from './WellContainer'
21-
import { WellTooltip } from './WellTooltip'
2222

2323
import type { WellGroup } from '@opentrons/components'
2424
import type { Liquid, RunTimeCommand } from '@opentrons/shared-data'
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
.container {
2+
display: flex;
3+
width: 100%;
4+
flex-direction: column;
5+
padding: var(--spacing-12);
6+
border-radius: var(--border-radius-8);
7+
background-color: var(--white);
8+
container-name: labware-slot-container;
9+
container-type: inline-size;
10+
gap: var(--spacing-8);
11+
}
12+
13+
.header {
14+
display: flex;
15+
width: 100%;
16+
align-items: center;
17+
justify-content: space-between;
18+
}
19+
20+
/* basic padding is 12px because of the default width */
21+
.main_content {
22+
display: flex;
23+
width: 100%;
24+
align-items: center;
25+
justify-content: space-between;
26+
padding: var(--spacing-12);
27+
border-radius: var(--border-radius-4);
28+
background-color: var(--grey-10);
29+
}
30+
31+
.info_label_container {
32+
display: flex;
33+
align-items: center;
34+
gap: var(--spacing-4);
35+
}
36+
37+
.labware_render_container {
38+
display: flex;
39+
width: 100%;
40+
align-items: center;
41+
justify-content: center;
42+
}
43+
44+
/* Width 172px up to 299px */
45+
@container labware-slot-container (min-width: 172px) and (max-width: 299px) {
46+
.main_content {
47+
padding: var(--spacing-12);
48+
}
49+
}
50+
51+
/* Width 300px up to 449px */
52+
@container labware-slot-container (min-width: 300px) and (max-width: 449px) {
53+
.main_content {
54+
padding: var(--spacing-20);
55+
}
56+
}
57+
58+
/* Width 450px up to 599px */
59+
@container labware-slot-container (min-width: 450px) and (max-width: 599px) {
60+
.main_content {
61+
padding: var(--spacing-32);
62+
}
63+
}
64+
65+
/* Width 600px and up */
66+
@container labware-slot-container (min-width: 600px) {
67+
.main_content {
68+
padding: var(--spacing-40);
69+
}
70+
}

app/src/organisms/Desktop/ProtocolVisualization/ModuleContainer.tsx renamed to app/src/organisms/Desktop/ProtocolVisualization/ModuleContainer/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
THERMOCYCLER_MODULE_TYPE,
1313
} from '@opentrons/shared-data'
1414

15+
import { ModuleStatusContainer } from '../ModuleStatusContainer'
1516
import styles from './modulecontainer.module.css'
16-
import { ModuleStatusContainer } from './ModuleStatusContainer'
1717

1818
import type { ModuleEntities, RobotState } from '@opentrons/step-generation'
1919

app/src/organisms/Desktop/ProtocolVisualization/modulecontainer.module.css renamed to app/src/organisms/Desktop/ProtocolVisualization/ModuleContainer/modulecontainer.module.css

File renamed without changes.

app/src/organisms/Desktop/ProtocolVisualization/ModuleStatusContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'
22

33
import { StyledText } from '@opentrons/components'
44

5-
import styles from './modulecontainer.module.css'
5+
import styles from './ModuleContainer/modulecontainer.module.css'
66

77
interface ModuleStatusContainerProps {
88
title: string

app/src/organisms/Desktop/ProtocolVisualization/PipetteContainer.tsx renamed to app/src/organisms/Desktop/ProtocolVisualization/PipetteContainer/index.tsx

File renamed without changes.

app/src/organisms/Desktop/ProtocolVisualization/pipettecontainer.module.css renamed to app/src/organisms/Desktop/ProtocolVisualization/PipetteContainer/pipettecontainer.module.css

File renamed without changes.

app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer.tsx

Lines changed: 0 additions & 114 deletions
This file was deleted.

app/src/organisms/Desktop/ProtocolVisualization/__tests__/StepDetailContainer.test.tsx renamed to app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer/__tests__/StepDetailContainer.test.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
33

44
import { renderWithProviders } from '/app/__testing-utils__'
55

6-
import { LabwareSlotContainer } from '../LabwareSlotContainer'
7-
import { PipetteContainer } from '../PipetteContainer'
8-
import { StepDetailContainer } from '../StepDetailContainer'
9-
import { TipDisposalContainer } from '../TipDisposalContainer'
10-
import { TipPickupContainer } from '../TipPickupContainer'
6+
import { LabwareSlotContainer } from '../../LabwareSlotContainer'
7+
import { PipetteContainer } from '../../PipetteContainer'
8+
import { StepDetailContainer } from '../../StepDetailContainer'
9+
import { TipDisposalContainer } from '../../TipDisposalContainer'
10+
import { TipPickupContainer } from '../../TipPickupContainer'
1111

1212
import type { ComponentProps } from 'react'
1313
import type { RunTimeCommand } from '@opentrons/shared-data'
1414
import type { InvariantContext, RobotState } from '@opentrons/step-generation'
1515

16-
vi.mock('../PipetteContainer')
17-
vi.mock('../TipDisposalContainer')
18-
vi.mock('../TipPickupContainer')
19-
vi.mock('../LabwareSlotContainer')
16+
vi.mock('../../PipetteContainer')
17+
vi.mock('../../TipDisposalContainer')
18+
vi.mock('../../TipPickupContainer')
19+
vi.mock('../../LabwareSlotContainer')
2020

2121
const render = (props: ComponentProps<typeof StepDetailContainer>) => {
2222
return renderWithProviders(<StepDetailContainer {...props} />)

0 commit comments

Comments
 (0)