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.

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

refactor(app): add modal mixed media content #15373

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Conversation

sfoster1
Copy link
Member

@sfoster1 sfoster1 commented Jun 10, 2024

This is a component for InterventionModal (and eventually the rest of the kinds of modal) that presents some kind of selectable visual element

  • spinner, icon, image
  • and some text.

Implements https://www.figma.com/design/8dMeu8MuPfXoORtOV6cACO/Feature%3A-Error-Recovery?node-id=1935-44819&t=pKbR40CZeBMrPLxM-4

Storybook: https://s3-us-west-2.amazonaws.com/opentrons-components/exec-489-add-mixed-content/index.html?path=/docs/app-molecules-interventionmodal-modalcontentmixed--docs

Closes EXEC-489

@sfoster1 sfoster1 requested a review from a team as a code owner June 10, 2024 13:43
@sfoster1 sfoster1 requested review from mjhuff and removed request for a team June 10, 2024 13:43
Copy link
Contributor

@mjhuff mjhuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thank you!

@sfoster1 sfoster1 force-pushed the exec-489-add-mixed-content branch 3 times, most recently from 79f6927 to 4f93543 Compare June 17, 2024 19:07
This is a component for InterventionModal (and eventually the rest of
the kinds of modal) that presents some kind of selectable visual element
- spinner, icon context, image - and some text.

Implemented for both the desktop and ODD.

Closes EXEC-489
@sfoster1 sfoster1 merged commit a648cd6 into edge Jun 21, 2024
33 checks passed
@sfoster1 sfoster1 deleted the exec-489-add-mixed-content branch June 21, 2024 20:02
nbshiland pushed a commit that referenced this pull request Jun 25, 2024
sfoster1 added a commit that referenced this pull request Jun 27, 2024
Implements the Description modal content component for ODD and Desktop.

Also updates `InlineNotification` to have corresponding desktop styles
using the new `StyledText`, which means it doesn't have to be ODD only
anymore so pop its stories over to `App`.

Note - can't be merged until #15373 is merged because it needs the
StyledText fixes from there.

Closes EXEC-491
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants