Skip to content

Remove direct use of EuiModal classes #2

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
azasypkin merged 2 commits into from
Apr 20, 2020
Merged

Remove direct use of EuiModal classes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6f189
Remove direct use of EuiModal classes
ryankeairns Apr 20, 2020
0410f17
address feedback
ryankeairns Apr 20, 2020
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
14 changes: 9 additions & 5 deletions x-pack/plugins/security/public/authentication/access_notice/_access_notice_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@
max-width: 600px;
}

.secAccessNoticePage__container {
@include euiBottomShadowSmall;
animation: none;
.secAccessNoticePage__textWrapper {
overflow-y: hidden;
}

.secAccessNoticePage__text {
@include euiYScrollWithShadows;
max-height: 400px;
padding-top: $euiSize;
padding: $euiSize $euiSizeL 0;
}

.secAccessNoticePage__footer {
justify-content: flex-start;
padding: $euiSize $euiSizeL $euiSizeL;
}

.secAccessNoticePage__footerInner {
text-align: left;
}
50 changes: 26 additions & 24 deletions x-pack/plugins/security/public/authentication/access_notice/access_notice_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import './_index.scss';
import React, { FormEvent, MouseEvent, useCallback, useEffect, useState } from 'react';
import ReactDOM from 'react-dom';
import ReactMarkdown from 'react-markdown';
import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
import { EuiButton, EuiPanel, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { CoreStart, FatalErrorsStart, HttpStart, NotificationsStart } from 'src/core/public';
Expand Down Expand Up @@ -67,33 +67,35 @@ export function AccessNoticePage({ http, fatalErrors, notifications }: Props) {
}
>
<form onSubmit={onAcknowledge}>
<div className="euiModal secAccessNoticePage__container">
<div className="euiModal__flex">
<div className="euiModalBody euiModalBody__overflow secAccessNoticePage__text">
<div className="euiModalBody__overflow secAccessNoticePage__text">
<EuiPanel paddingSize="none">
<EuiFlexGroup gutterSize="none" direction="column">
<EuiFlexItem className="secAccessNoticePage__textWrapper">
<div className="secAccessNoticePage__text">
<EuiText textAlign="left">
<ReactMarkdown>{accessNotice}</ReactMarkdown>
</EuiText>
</div>
</div>
<div className="euiModalFooter secAccessNoticePage__footer">
<EuiButton
fill
type="submit"
color="primary"
onClick={onAcknowledge}
isDisabled={isLoading}
isLoading={isLoading}
data-test-subj="accessNoticeAcknowledge"
>
<FormattedMessage
id="xpack.security.accessNotice.acknowledgeButtonText"
defaultMessage="Acknowledge and continue"
/>
</EuiButton>
</div>
</div>
</div>
</EuiFlexItem>
<EuiFlexItem className="secAccessNoticePage__footer">
<div className="secAccessNoticePage__footerInner">
<EuiButton
fill
type="submit"
color="primary"
onClick={onAcknowledge}
isDisabled={isLoading}
isLoading={isLoading}
data-test-subj="accessNoticeAcknowledge"
>
<FormattedMessage
id="xpack.security.accessNotice.acknowledgeButtonText"
defaultMessage="Acknowledge and continue"
/>
</EuiButton>
</div>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>
<EuiSpacer size="xxl" />
</form>
</AuthenticationStatePage>
Expand Down