diff --git a/client/src/components/forms/RoleForm/index.tsx b/client/src/components/forms/RoleForm/index.tsx index a737a24465c3b8499ec163f947e030d28bdeda16..198b5b7fd645a0c4a7e820f104597281943af98d 100644 --- a/client/src/components/forms/RoleForm/index.tsx +++ b/client/src/components/forms/RoleForm/index.tsx @@ -7,6 +7,7 @@ import RoleChangeForm from 'components/forms/RoleForm/RoleChangeForm'; import RoleEditForm from 'components/forms/RoleForm/RoleEditForm'; import './role-form.scss'; +import '../form.scss' interface Props { roles: TeamRole[]; diff --git a/client/src/components/forms/RoleForm/role-form.scss b/client/src/components/forms/RoleForm/role-form.scss index c13a60132d0a138184882ab68db528006eff18e2..d66a514f58ec08395900acbcf87f8f0d0400360a 100644 --- a/client/src/components/forms/RoleForm/role-form.scss +++ b/client/src/components/forms/RoleForm/role-form.scss @@ -5,8 +5,11 @@ display: flex; flex-direction: column; + h2 { + margin-top: 0; + } .role-item { - background: s.$background-light; + background: s.$background-input; border-radius: 25px; font-size: 18px; width: 100%; @@ -109,6 +112,7 @@ .role-edit-form { h2 { margin-bottom: 40px; + margin-top: 0; } .button { diff --git a/client/src/components/ui/AssigneeList/assignee-list.scss b/client/src/components/ui/AssigneeList/assignee-list.scss index 3fd3ca1a77bc425cce07b30e79c18d1cf32b4d76..498286fe47d0d9c98ffabff7d7812930bcb978d0 100644 --- a/client/src/components/ui/AssigneeList/assignee-list.scss +++ b/client/src/components/ui/AssigneeList/assignee-list.scss @@ -5,19 +5,13 @@ display: flex; margin-left: 16px; - &:hover { - .assignee { - margin-left: 0; - } - } - .tooltip { - margin-left: -8px; + margin-left: -4px; } .assignee, .avatar { - margin-left: -8px; + margin-left: -4px; width: 35px; height: 35px; diff --git a/client/src/components/ui/Popup/popup.scss b/client/src/components/ui/Popup/popup.scss index 8293f07781040ac84e837618653f3756536c9d6a..2b777f34ce119d51008014a1f8a998b6863dc8de 100644 --- a/client/src/components/ui/Popup/popup.scss +++ b/client/src/components/ui/Popup/popup.scss @@ -20,7 +20,7 @@ overflow: auto; padding: 50px; max-width: 960px; - background: s.$background-white; + background: s.$background-light; border-radius: 25px; position: relative; z-index: 2;