Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

Fix styling of project list, user list and add communication #561

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions frontend/src/components/student/studentCommunicationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ export default function StudentCommunicationList({ student }: CommunicationListP
return (
<div
data-testid="student-communication"
className={styles.student_communcation_list_outer_div + " h-100"}
className={styles.student_communcation_list_outer_div + " h-100 w-100"}
>
<div className={"overflow-auto p-3"} style={{ height: "100%" }}>
<div className={"overflow-auto p-3 w-100"} style={{ height: "100%" }}>
<div className={styles.student_info_button + " row"}>
<Button
variant="btn-outline"
Expand All @@ -82,7 +82,7 @@ export default function StudentCommunicationList({ student }: CommunicationListP
{capitalize(t("student info"))}
</Button>
</div>
<div className="row w-100">
<div className="w-100">
<Row className={styles.student_row_add_communication}>
<Col>
<h1>{student?.callName}</h1>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/students/[id]/register-communication.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export default function CommunicationInfoPage() {
<StudentList isDraggable={false} />
</div>
<div className={styles.info_field}>
<div data-testid="student-communication">
<div data-testid="student-communication" className={"h-100 overflow-auto"}>
<div className={"h-100"}>
<div className={"overflow-auto p-3"} style={{ height: "calc(100% - 4rem)" }}>
<div className={"overflow-auto p-3"}>
<div className="row" style={{ paddingLeft: 25 }}>
<RegisterCommunication />
</div>
Expand Down
10 changes: 3 additions & 7 deletions frontend/src/styles/projects/projectList.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
height: 100%;
background-color: #0a0839;
overflow: auto;
position: relative;
padding-bottom: 3em;
display: flex;
flex-direction: column;
}

.project_list_button {
width: 95%;
margin: 0.5rem;
}

.bottom_page {
position: absolute;
bottom: 0;
}

.project_list_header {
background-color: #0a0839;
color: #ffffff;
Expand Down Expand Up @@ -44,4 +39,5 @@

.project_list_list_group {
border-radius: 0;
flex-grow: 1;
}
3 changes: 2 additions & 1 deletion frontend/src/styles/usersOverview.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

.users_full_div {
position: fixed;
height: 100%;
height: calc(100% - 4rem);
overflow: auto;
width: 100%;
left: 0;
z-index: 10;
Expand Down