diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.sass b/ui/src/components/Modals/AddUserModal/AddUserModal.sass index f8badd8f1..dc967b282 100644 --- a/ui/src/components/Modals/AddUserModal/AddUserModal.sass +++ b/ui/src/components/Modals/AddUserModal/AddUserModal.sass @@ -1,5 +1,20 @@ -.user__email - width : 301px +@import '../../../variables.module' +<<<<<<< HEAD .user__role width : 186px +======= +.user + &__details + display: flex; + align-content: center; + align-items: center; + justify-content: space-between; + + + & .user__email + width : 40% + + & .user__role + width : 40% +>>>>>>> 1cfc896c105820df2713ea2c2d4e489f4c5c8731 diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx index 1f2d8c8a0..e92900fd6 100644 --- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx +++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx @@ -71,30 +71,35 @@ export const AddUserModal: FC = ({isOpen, onCloseModal, userD return (<> -

DETAILS

-
+

DETAILS

+
+
{}}> - + {/* {roles.map((role) => ( {role.value} ))} - - {/* - Select Role - + + None + + {roles.map((role) => ( {role.value} ))} - - */} + +
-

WORKSPACE ACCESS

+
+ +

WORKSPACE ACCESS

= observer(({title, is const classes = useCommonStyles(); const confirmStyle = {width: 100, marginLeft: 20} return ( - +
{title ?? "CONFIRMATION"}
close diff --git a/ui/src/components/UI/SelectList.tsx b/ui/src/components/UI/SelectList.tsx index de072e6a4..298f984c4 100644 --- a/ui/src/components/UI/SelectList.tsx +++ b/ui/src/components/UI/SelectList.tsx @@ -66,7 +66,7 @@ const SelectList: React.FC = ({valuesListInput,tableName,multiSelect=true return Object.keys(valuesList).filter((listValue) => listValue.includes(searchValue)); },[valuesList, searchValue]) - return
+ return
{tableHead} diff --git a/ui/src/components/UI/style/SelectList.sass b/ui/src/components/UI/style/SelectList.sass index df8d62f4f..2b09065f5 100644 --- a/ui/src/components/UI/style/SelectList.sass +++ b/ui/src/components/UI/style/SelectList.sass @@ -1,6 +1,6 @@ @import '../../../variables.module' -.namespacesTable +.select-list-table table width: 100% margin-top: 20px