Skip to content

Commit

Permalink
Fix some EuiFlyout and EuiModal usages (elastic#35829)
Browse files Browse the repository at this point in the history
* Fix maps layer flyout

* Fixing some flyout headers with border and size

* Using euiOverflowShadow to remove warnings

* Fixed up some regular modal usages

* Added danger colors to EuiConfirmModals where necessary
  • Loading branch information
cchaos authored May 1, 2019
1 parent 3c6bbc3 commit 6268ee7
Show file tree
Hide file tree
Showing 32 changed files with 317 additions and 238 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { injectI18n, FormattedMessage } from '@kbn/i18n/react';

import {
EuiButton,
EuiButtonEmpty,
EuiFieldText,
EuiModal,
EuiModalBody,
Expand Down Expand Up @@ -90,10 +91,12 @@ class DashboardCloneModalUi extends React.Component {

return (
<Fragment>
<EuiSpacer />
<EuiCallOut
size="s"
title={this.props.intl.formatMessage({
id: 'kbn.dashboard.topNav.cloneModal.dashboardExistsTitle',
defaultMessage: 'A Dashboard with the title {newDashboardName} already exists.',
defaultMessage: 'A dashboard with the title {newDashboardName} already exists.',
}, {
newDashboardName: `'${this.state.newDashboardName}'`,
})}
Expand All @@ -117,7 +120,6 @@ class DashboardCloneModalUi extends React.Component {
/>
</p>
</EuiCallOut>
<EuiSpacer />
</Fragment>
);
}
Expand All @@ -134,7 +136,7 @@ class DashboardCloneModalUi extends React.Component {
<EuiModalHeaderTitle>
<FormattedMessage
id="kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle"
defaultMessage="Clone Dashboard"
defaultMessage="Clone dashboard"
/>
</EuiModalHeaderTitle>
</EuiModalHeader>
Expand All @@ -151,8 +153,6 @@ class DashboardCloneModalUi extends React.Component {

<EuiSpacer />

{this.renderDuplicateTitleCallout()}

<EuiFieldText
autoFocus
data-test-subj="clonedDashboardTitle"
Expand All @@ -161,18 +161,20 @@ class DashboardCloneModalUi extends React.Component {
isInvalid={this.state.hasTitleDuplicate}
/>

{this.renderDuplicateTitleCallout()}

</EuiModalBody>

<EuiModalFooter>
<EuiButton
<EuiButtonEmpty
data-test-subj="cloneCancelButton"
onClick={this.props.onClose}
>
<FormattedMessage
id="kbn.dashboard.topNav.cloneModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButton>
</EuiButtonEmpty>

<EuiButton
fill
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export class SourceFiltersTable extends Component {
id="kbn.management.editIndexPattern.source.deleteFilter.cancelButtonLabel"
defaultMessage="Cancel"
/>}
buttonColor="danger"
confirmButtonText={<FormattedMessage
id="kbn.management.editIndexPattern.source.deleteFilter.deleteButtonLabel"
defaultMessage="Delete"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6268ee7

Please sign in to comment.