Skip to content

Commit

Permalink
refactor(app): Border radius final feedback (#14695)
Browse files Browse the repository at this point in the history
Closes EXEC-338
  • Loading branch information
mjhuff authored and Carlos-fernandez committed May 20, 2024
1 parent e50afb4 commit c614563
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export function CurrentOffsetsTable(
<OffsetTableRow key={offset.id}>
<OffsetTableDatum
css={`
border-radius: ${BORDERS.borderRadius4} 0 0
${BORDERS.borderRadius4};
border-radius: ${BORDERS.borderRadius8} 0 0
${BORDERS.borderRadius8};
`}
>
{getDisplayLocation(
Expand All @@ -105,8 +105,8 @@ export function CurrentOffsetsTable(
<OffsetTableDatum>{labwareDisplayName}</OffsetTableDatum>
<OffsetTableDatum
css={`
border-radius: 0 ${BORDERS.borderRadius4}
${BORDERS.borderRadius4} 0;
border-radius: 0 ${BORDERS.borderRadius8}
${BORDERS.borderRadius8} 0;
`}
>
<OffsetVector {...offset.vector} />
Expand Down
2 changes: 2 additions & 0 deletions app/src/organisms/EmergencyStop/EstopPressedModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useSelector } from 'react-redux'
import { useTranslation } from 'react-i18next'
import {
ALIGN_CENTER,
BORDERS,
COLORS,
DIRECTION_COLUMN,
DIRECTION_ROW,
Expand Down Expand Up @@ -100,6 +101,7 @@ function TouchscreenModal({
flexDirection={DIRECTION_ROW}
justifyContent={JUSTIFY_SPACE_BETWEEN}
alignItems={ALIGN_CENTER}
borderRadius={BORDERS.borderRadius8}
>
<StyledText as="p" fontWeight={TYPOGRAPHY.fontWeightSemiBold}>
{t('estop')}
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/InterventionModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export function InterventionModal({
// reimplement when design system shares a modal component between desktop/ODD
return isOnDevice ? (
<Modal
border={`8px ${BORDERS.styleSolid} ${COLORS.blue50}`}
border={`${BORDERS.borderRadius8} ${BORDERS.styleSolid} ${COLORS.blue50}`}
modalSize="large"
header={{
backgroundColor: COLORS.blue50,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function RunFailedModal({
gridGap={SPACING.spacing8}
maxHeight="11rem"
backgroundColor={COLORS.grey35}
borderRadius={BORDERS.borderRadius12}
borderRadius={BORDERS.borderRadius8}
padding={`${SPACING.spacing16} ${SPACING.spacing20}`}
>
<Flex flexDirection={DIRECTION_COLUMN} css={SCROLL_BAR_STYLE}>
Expand Down

0 comments on commit c614563

Please sign in to comment.