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

A few more PR feedback #2

Merged
merged 1 commit into from
Jul 18, 2018
Merged

A few more PR feedback #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions x-pack/plugins/security/public/components/management/users/edit_user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
EuiTitle,
EuiForm,
EuiFormRow,
EuiToolTip,
EuiIcon,
EuiText,
EuiFieldText,
EuiPage,
EuiComboBox,
Expand Down Expand Up @@ -284,21 +284,21 @@ export class EditUser extends Component {
<EuiPageContentHeader>
<EuiPageContentHeaderSection>
<EuiTitle>
<h2>
{isNewUser ? 'New User' : `"${user.username}" User`} &nbsp;

{reserved ? (
<EuiToolTip
content={'Reserved users are built-in and cannot be removed or modified. Only the password may be changed.'}
>
<EuiIcon style={{ verticalAlign: "super" }} type={'lock'} />
</EuiToolTip>
) : null}
</h2>
<h2>{isNewUser ? 'New user' : `Edit "${user.username}" user`}</h2>
</EuiTitle>
</EuiPageContentHeaderSection>
{reserved &&
<EuiPageContentHeaderSection>
<EuiIcon type="lock" size="l" color="subdued" />
</EuiPageContentHeaderSection>
}
</EuiPageContentHeader>
<EuiPageContentBody>
{reserved &&
<EuiText size="s" color="subdued">
<p>Reserved users are built-in and cannot be removed or modified. Only the password may be changed.</p>
</EuiText>
}

{showDeleteConfirmation ? (
<ConfirmDelete
Expand Down Expand Up @@ -418,15 +418,15 @@ export class EditUser extends Component {
<EuiFlexItem grow={true} />
{isNewUser || reserved ? null : (
<EuiFlexItem grow={false}>
<EuiButton
<EuiButtonEmpty
onClick={() => {
this.setState({ showDeleteConfirmation: true });
}}
data-test-subj="userFormDeleteButton"
color="danger"
>
Delete user
</EuiButton>
</EuiButtonEmpty>
</EuiFlexItem>
)}
</EuiFlexGroup>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security/public/components/management/users/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class Users extends Component {
return (
<EuiPage className="mgtUsersListingPage">
<EuiPageBody>
<EuiPageContent horizontalPosition="center" className="mgtUsersListingPage__content">
<EuiPageContent horizontalPosition="center">
<EuiEmptyPrompt
iconType="securityApp"
iconColor={null}
Expand Down Expand Up @@ -188,7 +188,7 @@ export class Users extends Component {
return (
<EuiPage className="mgtUsersListingPage">
<EuiPageBody>
<EuiPageContent verticalPosition="center" horizontalPosition="center" className="mgtUsersListingPage__content">
<EuiPageContent className="mgtUsersListingPage__content">
<EuiPageContentHeader>
<EuiPageContentHeaderSection>
<EuiTitle>
Expand Down
9 changes: 2 additions & 7 deletions x-pack/plugins/security/public/views/management/management.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,12 @@
}

.mgtUsersListingPage__content {
max-width: 1000px;
flex-grow: 0;
}

.mgtUsersEditPage__content {
max-width: 460px;
margin-left: auto;
margin-right: auto;
}

.mgtUsersEditPage__reservedTooltip {
vertical-align: super;
line-height: 1em;
margin-left: 1em;
flex-grow: 0;
}