Skip to content

Added EuiOverlayMask directly to EuiModal #4480

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

Merged
cchaos merged 9 commits into from
Feb 5, 2021
Merged

Added EuiOverlayMask directly to EuiModal #4480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7802a85
added EuiOverlayMask directly
akashgp09 Feb 3, 2021
2b32e39
updated snapshots
akashgp09 Feb 3, 2021
9c50bcf
Updated CL
akashgp09 Feb 3, 2021
e98dfdc
removed EuiOverlayMask
akashgp09 Feb 3, 2021
20a2380
Merge branch 'master' into EuiModal
akashgp09 Feb 5, 2021
564d240
Fixing EuiMarkdownEditor usage
Feb 5, 2021
193ed1a
Cleaning up the docs and fixing mobile widths
Feb 5, 2021
2351457
Merge branch 'EuiModal' of github.com:akashgp09/eui into EuiModal
Feb 5, 2021
2edf742
Merge branch 'master' into EuiModal
cchaos Feb 5, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added `EuiOverlayMask` directly to `EuiModal` ([#4480](https://github.com/elastic/eui/pull/4480))

**Bug fixes**

- Fixed invalid color entry passed to `EuiBadge` color prop ([#4481](https://github.com/elastic/eui/pull/4481))
Expand Down
25 changes: 11 additions & 14 deletions src-docs/src/views/color_picker/containers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
EuiModalBody,
EuiModalHeader,
EuiModalHeaderTitle,
EuiOverlayMask,
EuiSpacer,
} from '../../../../src/components';

Expand Down Expand Up @@ -63,19 +62,17 @@ export default () => {

if (isModalVisible) {
modal = (
<EuiOverlayMask>
<EuiModal onClose={closeModal} style={{ width: '800px' }}>
<EuiModalHeader>
<EuiModalHeaderTitle>Color picker in a modal</EuiModalHeaderTitle>
</EuiModalHeader>

<EuiModalBody>
<EuiFormRow label="Color picker">{colorPicker}</EuiFormRow>
<EuiSpacer />
<EuiFormRow label="Color stops">{stops}</EuiFormRow>
</EuiModalBody>
</EuiModal>
</EuiOverlayMask>
<EuiModal onClose={closeModal} style={{ width: '800px' }}>
<EuiModalHeader>
<EuiModalHeaderTitle>Color picker in a modal</EuiModalHeaderTitle>
</EuiModalHeader>

<EuiModalBody>
<EuiFormRow label="Color picker">{colorPicker}</EuiFormRow>
<EuiSpacer />
<EuiFormRow label="Color stops">{stops}</EuiFormRow>
</EuiModalBody>
</EuiModal>
);
}

Expand Down
17 changes: 7 additions & 10 deletions src-docs/src/views/combo_box/containers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
EuiModalBody,
EuiModalHeader,
EuiModalHeaderTitle,
EuiOverlayMask,
EuiSpacer,
} from '../../../../src/components';

Expand Down Expand Up @@ -122,15 +121,13 @@ export default () => {

if (isModalVisible) {
modal = (
<EuiOverlayMask>
<EuiModal onClose={closeModal} style={{ width: '800px' }}>
<EuiModalHeader>
<EuiModalHeaderTitle>Combo box in a modal</EuiModalHeaderTitle>
</EuiModalHeader>

<EuiModalBody>{comboBox}</EuiModalBody>
</EuiModal>
</EuiOverlayMask>
<EuiModal onClose={closeModal} style={{ width: '800px' }}>
<EuiModalHeader>
<EuiModalHeaderTitle>Combo box in a modal</EuiModalHeaderTitle>
</EuiModalHeader>

<EuiModalBody>{comboBox}</EuiModalBody>
</EuiModal>
);
}

Expand Down
Loading