From bb47b8052bf8560a71957a23f5d09715f44d4aa0 Mon Sep 17 00:00:00 2001 From: "Planoetscher Daniel (Student Com20)" <daniel.planoetscher@stud-inf.unibz.it> Date: Sun, 20 Jun 2021 22:05:09 +0200 Subject: [PATCH] bugfixes for popups and assignee list --- client/src/components/forms/RoleForm/index.tsx | 1 + client/src/components/forms/RoleForm/role-form.scss | 6 +++++- .../src/components/ui/AssigneeList/assignee-list.scss | 10 ++-------- client/src/components/ui/Popup/popup.scss | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/client/src/components/forms/RoleForm/index.tsx b/client/src/components/forms/RoleForm/index.tsx index a737a24..198b5b7 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 c13a601..d66a514 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 3fd3ca1..498286f 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 8293f07..2b777f3 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; -- GitLab