fix: Update UI changes
This commit is contained in:
parent
6c8eaf2aad
commit
efad40becd
|
|
@ -7,10 +7,6 @@ import { isPermitted } from "pages/Applications/permissionHelpers";
|
||||||
const StyledDialog = styled(Dialog)<{ setMaxWidth?: boolean }>`
|
const StyledDialog = styled(Dialog)<{ setMaxWidth?: boolean }>`
|
||||||
&& {
|
&& {
|
||||||
background: white;
|
background: white;
|
||||||
& .bp3-dialog-header {
|
|
||||||
padding: ${props => props.theme.spaces[4]}px
|
|
||||||
${props => props.theme.spaces[4]}px;
|
|
||||||
}
|
|
||||||
& .bp3-dialog-footer-actions {
|
& .bp3-dialog-footer-actions {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,6 @@ const renderComponent = (
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<SelectComponent {...componentProps} />
|
<SelectComponent {...componentProps} />
|
||||||
<FormFieldError
|
|
||||||
error={componentProps.meta.touched && componentProps.meta.error}
|
|
||||||
/>
|
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ const LoadingContainer = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-grow: 1;
|
flex-shrink: 1;
|
||||||
margin: 0 10px;
|
margin: 0 10px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
@ -49,6 +49,12 @@ const StretchedBreadCrumb = styled(Breadcrumbs)`
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const InviteButton = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-grow: 1;
|
||||||
|
justify-content: flex-end;
|
||||||
|
`;
|
||||||
|
|
||||||
type EditorHeaderProps = {
|
type EditorHeaderProps = {
|
||||||
isSaving?: boolean;
|
isSaving?: boolean;
|
||||||
pageSaveError?: boolean;
|
pageSaveError?: boolean;
|
||||||
|
|
@ -140,6 +146,9 @@ export const EditorHeader = (props: EditorHeaderProps) => {
|
||||||
<StyledHeader>
|
<StyledHeader>
|
||||||
<StretchedBreadCrumb items={navigation} minVisibleItems={3} />
|
<StretchedBreadCrumb items={navigation} minVisibleItems={3} />
|
||||||
<CustomizedDropdown {...pageSelectorData} />
|
<CustomizedDropdown {...pageSelectorData} />
|
||||||
|
<InviteButton>
|
||||||
|
<Button text="Share" intent="primary" filled size="small" />
|
||||||
|
</InviteButton>
|
||||||
<LoadingContainer>{saveStatusMessage}</LoadingContainer>
|
<LoadingContainer>{saveStatusMessage}</LoadingContainer>
|
||||||
<PreviewPublishSection>
|
<PreviewPublishSection>
|
||||||
<Button
|
<Button
|
||||||
|
|
|
||||||
|
|
@ -19,15 +19,13 @@ import { OrgRole } from "constants/orgConstants";
|
||||||
import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
|
import { INVITE_USERS_TO_ORG_FORM } from "constants/forms";
|
||||||
import { Classes } from "@blueprintjs/core";
|
import { Classes } from "@blueprintjs/core";
|
||||||
import { noop } from "lodash";
|
import { noop } from "lodash";
|
||||||
|
|
||||||
const StyledForm = styled.div`
|
const StyledForm = styled.div`
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: white;
|
background: white;
|
||||||
padding: ${props => props.theme.spaces[5]}px;
|
padding: ${props => props.theme.spaces[5]}px;
|
||||||
|
|
||||||
&&& {
|
&&& {
|
||||||
.bp3-input {
|
.bp3-input {
|
||||||
box-shadow: none;
|
width: 250px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.manageUsers {
|
.manageUsers {
|
||||||
|
|
@ -36,17 +34,19 @@ const StyledForm = styled.div`
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
const StyledInviteFieldGroup = styled.div`
|
const StyledInviteFieldGroup = styled.div`
|
||||||
&& {
|
display: flex;
|
||||||
display: flex;
|
align-items: center;
|
||||||
flex-direction: row;
|
justify-content: space-between;
|
||||||
flex-wrap: none;
|
.users {
|
||||||
justify-content: space-between;
|
width: 300px;
|
||||||
align-items: flex-start;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.bp3-popover-target {
|
.wrapper {
|
||||||
padding-right: 10px;
|
display: flex;
|
||||||
padding-top: 5px;
|
width: 100%;
|
||||||
|
flex-direction: row;
|
||||||
|
alignItem: "center",
|
||||||
|
justifyContent: "center",
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
@ -64,8 +64,8 @@ const UserList = styled.div`
|
||||||
|
|
||||||
const StyledButton = styled(Button)`
|
const StyledButton = styled(Button)`
|
||||||
&&&.${Classes.BUTTON} {
|
&&&.${Classes.BUTTON} {
|
||||||
width: 100px;
|
width: 83px;
|
||||||
height: 32px;
|
height: 40px;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
@ -79,28 +79,24 @@ const InviteUsersForm = (props: any) => {
|
||||||
return (
|
return (
|
||||||
<StyledForm>
|
<StyledForm>
|
||||||
<StyledInviteFieldGroup>
|
<StyledInviteFieldGroup>
|
||||||
<FormGroup fill>
|
<TagListField
|
||||||
<TagListField
|
name="users"
|
||||||
name="users"
|
placeholder="Enter email address"
|
||||||
placeholder="Enter email address"
|
type="email"
|
||||||
type="email"
|
label="Emails"
|
||||||
label="Emails"
|
intent="success"
|
||||||
intent="success"
|
/>
|
||||||
/>
|
<SelectField
|
||||||
</FormGroup>
|
name="role"
|
||||||
<FormGroup fill>
|
placeholder="Select a role"
|
||||||
<SelectField
|
options={props.roles}
|
||||||
name="role"
|
size="large"
|
||||||
placeholder="Select a role"
|
/>
|
||||||
options={props.roles}
|
|
||||||
size="large"
|
|
||||||
/>
|
|
||||||
</FormGroup>
|
|
||||||
<StyledButton
|
<StyledButton
|
||||||
className="invite"
|
className="invite"
|
||||||
text="Invite"
|
text="Invite"
|
||||||
intent="primary"
|
|
||||||
filled
|
filled
|
||||||
|
intent="primary"
|
||||||
onClick={handleSubmit((values: any, dispatch: any) => {
|
onClick={handleSubmit((values: any, dispatch: any) => {
|
||||||
inviteUsersToOrg({ ...values, orgId: props.orgId }, dispatch);
|
inviteUsersToOrg({ ...values, orgId: props.orgId }, dispatch);
|
||||||
})}
|
})}
|
||||||
|
|
@ -119,8 +115,8 @@ const InviteUsersForm = (props: any) => {
|
||||||
<Button
|
<Button
|
||||||
className="manageUsers"
|
className="manageUsers"
|
||||||
text="Manage Users"
|
text="Manage Users"
|
||||||
intent="primary"
|
|
||||||
filled
|
filled
|
||||||
|
intent="primary"
|
||||||
onClick={noop}
|
onClick={noop}
|
||||||
/>
|
/>
|
||||||
</StyledForm>
|
</StyledForm>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user