Skip to content

Commit

Permalink
fix(app): confirm values button shrinking issue (#16134)
Browse files Browse the repository at this point in the history
* fix(app): confirm values button shrinking issue
  • Loading branch information
koji authored Aug 27, 2024
1 parent f4d512d commit f5e3317
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
20 changes: 12 additions & 8 deletions app/src/organisms/ChooseProtocolSlideout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@ import {
DISPLAY_BLOCK,
Flex,
Icon,
Link as LinkComponent,
JUSTIFY_CENTER,
JUSTIFY_END,
JUSTIFY_FLEX_START,
LegacyStyledText,
Link as LinkComponent,
NO_WRAP,
OVERFLOW_WRAP_ANYWHERE,
PrimaryButton,
ProtocolDeck,
SPACING,
SecondaryButton,
LegacyStyledText,
SPACING,
TYPOGRAPHY,
useTooltip,
useHoverTooltip,
useTooltip,
} from '@opentrons/components'
import {
ApiHostProvider,
Expand Down Expand Up @@ -587,17 +588,21 @@ export function ChooseProtocolSlideoutComponent(
{t('shared:continue_to_param')}
</PrimaryButton>
) : (
<Flex gridGap={SPACING.spacing8} flexDirection={DIRECTION_ROW}>
<Flex
gridGap={SPACING.spacing8}
flexDirection={DIRECTION_ROW}
whiteSpace={NO_WRAP}
>
<SecondaryButton
onClick={() => {
setCurrentPage(1)
}}
width="51%"
width="50%"
>
{t('shared:change_protocol')}
</SecondaryButton>
<PrimaryButton
width="49%"
width="50%"
onClick={handleProceed}
disabled={hasParamError}
{...targetPropsHover}
Expand All @@ -606,7 +611,6 @@ export function ChooseProtocolSlideoutComponent(
<Flex
gridGap={SPACING.spacing4}
alignItems={ALIGN_CENTER}
whiteSpace="nowrap"
marginLeft={`-${SPACING.spacing4}`}
>
<Icon name="ot-spinner" spin size="1rem" />
Expand Down
16 changes: 10 additions & 6 deletions app/src/organisms/ChooseRobotToRunProtocolSlideout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ import { useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'

import {
Icon,
Flex,
ALIGN_CENTER,
DIRECTION_COLUMN,
PrimaryButton,
DIRECTION_ROW,
Flex,
Icon,
NO_WRAP,
PrimaryButton,
SecondaryButton,
SPACING,
useHoverTooltip,
ALIGN_CENTER,
} from '@opentrons/components'
import { useUploadCsvFileMutation } from '@opentrons/react-api-client'

Expand Down Expand Up @@ -259,7 +260,11 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
</PrimaryButton>
</>
) : (
<Flex gridGap={SPACING.spacing8} flexDirection={DIRECTION_ROW}>
<Flex
gridGap={SPACING.spacing8}
flexDirection={DIRECTION_ROW}
whiteSpace={NO_WRAP}
>
<SecondaryButton
onClick={() => {
setCurrentPage(1)
Expand All @@ -278,7 +283,6 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
<Flex
gridGap={SPACING.spacing4}
alignItems={ALIGN_CENTER}
whiteSpace="nowrap"
marginLeft={`-${SPACING.spacing4}`}
>
<Icon name="ot-spinner" spin size="1rem" />
Expand Down

0 comments on commit f5e3317

Please sign in to comment.