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

Jump to bottom

add button variants to live modal preivew #2299

Merged
merged 8 commits into from
May 21, 2021
Merged

add button variants to live modal preivew #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a4d0b89
docs(Modal): update modal live preview
dakahn May 11, 2021
9833c89
Merge branch 'main' of github.com:carbon-design-system/carbon-website…
dakahn May 11, 2021
5e9a64f
docs(Modal): add solo button example to code docs
dakahn May 11, 2021
d17be31
docs(Modal): update action handler
dakahn May 13, 2021
847b302
Merge branch 'main' into 2118-add-footer-button-variants
jnm2377 May 13, 2021
1ffb593
Merge branch 'main' into 2118-add-footer-button-variants
dakahn May 14, 2021
c3e3fbd
Merge branch 'main' into 2118-add-footer-button-variants
tw15egan May 17, 2021
f372f52
Merge branch 'main' into 2118-add-footer-button-variants
andreancardona May 21, 2021
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
59 changes: 59 additions & 0 deletions src/pages/components/modal/code.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ documentation, see the Storybooks for each framework below.
id: 'scrolling-content',
label: 'With scrolling content',
},
{
id: 'with-one-button',
label: 'With one button',
},
{
id: 'with-three-buttons',
label: 'With three buttons',
},
]}>
<ComponentVariant
id="modal"
Expand Down Expand Up @@ -128,5 +136,56 @@ documentation, see the Storybooks for each framework below.
</p>
</>
</ModalWrapper>
`}</ComponentVariant>
<ComponentVariant
id="with-one-button"
links={{
React:
'https://react.carbondesignsystem.com/?path=/story/components-modal--default',
Angular:
'https://angular.carbondesignsystem.com/?path=/story/components-modal--basic',
Vue:
'http://vue.carbondesignsystem.com/?path=/story/components-cvmodal--default',
Vanilla: 'https://the-carbon-components.netlify.com/?nav=modal',
}}>{`
<ModalWrapper
buttonTriggerText="Launch modal"
modalHeading="Modal heading"
modalLabel="Label"
secondaryButtonText={null}
>
<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse cursus fermentum risus, sit amet fringilla nunc pellentesque quis. Duis quis odio ultrices, cursus lacus ac, posuere felis. Donec dignissim libero in augue mattis, a molestie metus vestibulum. Aliquam placerat felis ultrices lorem condimentum, nec ullamcorper felis porttitor. </p>
</ModalWrapper>
`}</ComponentVariant>
<ComponentVariant
id="with-three-buttons"
links={{
React:
'https://react.carbondesignsystem.com/?path=/story/components-modal--default',
Angular:
'https://angular.carbondesignsystem.com/?path=/story/components-modal--basic',
Vue:
'http://vue.carbondesignsystem.com/?path=/story/components-cvmodal--default',
Vanilla: 'https://the-carbon-components.netlify.com/?nav=modal',
}}>{`
<ModalWrapper
buttonTriggerText="Launch modal"
modalHeading="Modal heading"
modalLabel="Label"
secondaryButtons={
[
{
buttonText: 'Keep both',
onClick: () => {},
},
{
buttonText: 'Rename',
onClick: () => {},
}
]
}
>
<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse cursus fermentum risus, sit amet fringilla nunc pellentesque quis. Duis quis odio ultrices, cursus lacus ac, posuere felis. Donec dignissim libero in augue mattis, a molestie metus vestibulum. Aliquam placerat felis ultrices lorem condimentum, nec ullamcorper felis porttitor. </p>
</ModalWrapper>
`}</ComponentVariant>
</ComponentDemo>
59 changes: 59 additions & 0 deletions src/pages/components/modal/usage.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ destructive or irreversible then use a transactional danger modal.
id: 'scrolling-content',
label: 'With scrolling content',
},
{
id: 'with-one-button',
label: 'With one button',
},
{
id: 'with-three-buttons',
label: 'With three buttons',
},
]}>
<ComponentVariant
id="modal"
Expand Down Expand Up @@ -149,6 +157,57 @@ destructive or irreversible then use a transactional danger modal.
</p>
</>
</ModalWrapper>
`}</ComponentVariant>
<ComponentVariant
id="with-one-button"
links={{
React:
'https://react.carbondesignsystem.com/?path=/story/components-modal--default',
Angular:
'https://angular.carbondesignsystem.com/?path=/story/components-modal--basic',
Vue:
'http://vue.carbondesignsystem.com/?path=/story/components-cvmodal--default',
Vanilla: 'https://the-carbon-components.netlify.com/?nav=modal',
}}>{`
<ModalWrapper
buttonTriggerText="Launch modal"
modalHeading="Modal heading"
modalLabel="Label"
secondaryButtonText={null}
>
<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse cursus fermentum risus, sit amet fringilla nunc pellentesque quis. Duis quis odio ultrices, cursus lacus ac, posuere felis. Donec dignissim libero in augue mattis, a molestie metus vestibulum. Aliquam placerat felis ultrices lorem condimentum, nec ullamcorper felis porttitor. </p>
</ModalWrapper>
`}</ComponentVariant>
<ComponentVariant
id="with-three-buttons"
links={{
React:
'https://react.carbondesignsystem.com/?path=/story/components-modal--default',
Angular:
'https://angular.carbondesignsystem.com/?path=/story/components-modal--basic',
Vue:
'http://vue.carbondesignsystem.com/?path=/story/components-cvmodal--default',
Vanilla: 'https://the-carbon-components.netlify.com/?nav=modal',
}}>{`
<ModalWrapper
buttonTriggerText="Launch modal"
modalHeading="Modal heading"
modalLabel="Label"
secondaryButtons={
[
{
buttonText: 'Keep both',
onClick: () => {},
},
{
buttonText: 'Rename',
onClick: () => {},
}
]
}
>
<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse cursus fermentum risus, sit amet fringilla nunc pellentesque quis. Duis quis odio ultrices, cursus lacus ac, posuere felis. Donec dignissim libero in augue mattis, a molestie metus vestibulum. Aliquam placerat felis ultrices lorem condimentum, nec ullamcorper felis porttitor. </p>
</ModalWrapper>
`}</ComponentVariant>
</ComponentDemo>

Expand Down