Skip to content

Commit

Permalink
modifying the containers
Browse files Browse the repository at this point in the history
  • Loading branch information
koji committed Jan 28, 2025
1 parent cb02084 commit 7f9b706
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,17 @@ export function DeckSetupContainer(props: DeckSetupTabType): JSX.Element {
)

return (
<Flex height="100%">
// <Flex height="100%" css={{ outline: 'solid 1px red' }}>
<>
<Flex
backgroundColor={COLORS.white}
backgroundColor={COLORS.red20}
borderRadius={BORDERS.borderRadius12}
width="100%"
height={tab === 'protocolSteps' ? '65.75vh' : '100%'}
// height={tab === 'protocolSteps' ? '65.75vh' : '100%'}
height="65.75vh"
flexDirection={DIRECTION_COLUMN}
padding={isZoomed ? '0' : SPACING.spacing24}
padding={isZoomed ? '0' : SPACING.spacing40}
css={{ outline: 'solid 1px blue' }}
>
<Flex
width="100%"
Expand Down Expand Up @@ -404,6 +407,6 @@ export function DeckSetupContainer(props: DeckSetupTabType): JSX.Element {
setHoveredLabware={setHoveredLabware}
/>
) : null}
</Flex>
</>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export function ProtocolSteps(): JSX.Element {
flex="2.85"
paddingTop={showTimelineAlerts ? '0' : SPACING.spacing24}
position={POSITION_RELATIVE}
backgroundColor={COLORS.red40}
>
<Flex
flexDirection={DIRECTION_COLUMN}
Expand Down
12 changes: 9 additions & 3 deletions protocol-designer/src/pages/Designer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,19 @@ export function Designer(): JSX.Element {
flexDirection={DIRECTION_COLUMN}
backgroundColor={COLORS.grey10}
gridGap={SPACING.spacing24}
padding={zoomIn.slot != null ? '0' : SPACING.spacing40}
height="calc(100vh - 64px)"
padding={
zoomIn.slot != null
? '0'
: `${SPACING.spacing60} ${SPACING.spacing40}`
}
// height="calc(100vh - 64px)"
>
<Flex
flexDirection={DIRECTION_COLUMN}
gridGap={SPACING.spacing24}
height="100%"
// height="100%"
backgroundColor={COLORS.red40}
css={{ outline: 'solid 1px green' }}
>
{zoomIn.slot == null ? (
<Flex alignSelf={ALIGN_END}>
Expand Down

0 comments on commit 7f9b706

Please sign in to comment.