Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): fix UpdateAppModal style #15149

Merged
merged 3 commits into from
May 9, 2024
Merged

fix(app): fix UpdateAppModal style #15149

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa1b372
fix(app): style UpdateAppModal
ncdiehl11 May 9, 2024
f1cecfe
add HorizontalRule component for markdown divider
ncdiehl11 May 9, 2024
9454fdd
move HorizontalRule to ReleaseNotes
ncdiehl11 May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions app/src/organisms/UpdateAppModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {
Flex,
JUSTIFY_SPACE_AROUND,
JUSTIFY_SPACE_BETWEEN,
NewPrimaryBtn,
NewSecondaryBtn,
PrimaryButton,
SecondaryButton,
SPACING,
StyledText,
} from '@opentrons/components'
Expand Down Expand Up @@ -62,18 +62,7 @@ const PlaceholderError = ({
export const RELEASE_NOTES_URL_BASE =
'https://github.com/Opentrons/opentrons/releases/tag/v'
const UPDATE_ERROR = 'Update Error'
const FOOTER_BUTTON_STYLE = css`
text-transform: lowercase;
padding-left: ${SPACING.spacing16};
padding-right: ${SPACING.spacing16};
border-radius: ${BORDERS.borderRadius8};
margin-top: ${SPACING.spacing16};
margin-bottom: ${SPACING.spacing16};

&:first-letter {
text-transform: uppercase;
}
`
const UpdateAppBanner = styled(Banner)`
border: none;
`
Expand Down Expand Up @@ -122,7 +111,13 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
removeActiveAppUpdateToast()

const appUpdateFooter = (
<Flex alignItems={ALIGN_CENTER} justifyContent={JUSTIFY_SPACE_BETWEEN}>
<Flex
alignItems={ALIGN_CENTER}
justifyContent={JUSTIFY_SPACE_BETWEEN}
paddingY={SPACING.spacing16}
borderTop={BORDERS.lineBorder}
borderColor={COLORS.grey30}
>
<ExternalLink
href={`${RELEASE_NOTES_URL_BASE}${availableAppUpdateVersion}`}
css={css`
Expand All @@ -134,20 +129,18 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
{t('release_notes')}
</ExternalLink>
<Flex alignItems={ALIGN_CENTER} justifyContent={JUSTIFY_SPACE_AROUND}>
<NewSecondaryBtn
<SecondaryButton
onClick={handleRemindMeLaterClick}
marginRight={SPACING.spacing8}
css={FOOTER_BUTTON_STYLE}
>
{t('remind_later')}
</NewSecondaryBtn>
<NewPrimaryBtn
</SecondaryButton>
<PrimaryButton
onClick={() => dispatch(downloadShellUpdate())}
marginRight={SPACING.spacing12}
css={FOOTER_BUTTON_STYLE}
>
{t('update_app_now')}
</NewPrimaryBtn>
</PrimaryButton>
</Flex>
</Flex>
)
Expand Down
Loading