From 6407c1c3e838aaa566bd754eb611d3675c0853c1 Mon Sep 17 00:00:00 2001
From: Johan Kristiansson <johankristiansson22@gmail.com>
Date: Wed, 6 Dec 2023 10:52:28 +0100
Subject: [PATCH] Css fix on addmembermodal
---
client/ideaBank/ideaCard.css | 1 +
client/projectPage/addMemberModal.html | 12 ++++++------
client/projectPage/projectPage.ts | 6 +++++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/client/ideaBank/ideaCard.css b/client/ideaBank/ideaCard.css
index 6ecbb7a2..d7b7e05e 100644
--- a/client/ideaBank/ideaCard.css
+++ b/client/ideaBank/ideaCard.css
@@ -4,6 +4,7 @@
overflow: hidden;
text-overflow: ellipsis;
font-size: 13px;
+ color: black;
}
.ideaCardFontComments {
font-family: "Roboto", sans-serif;
diff --git a/client/projectPage/addMemberModal.html b/client/projectPage/addMemberModal.html
index a9be95d8..d3b794b2 100644
--- a/client/projectPage/addMemberModal.html
+++ b/client/projectPage/addMemberModal.html
@@ -1,8 +1,8 @@
<!-- addMemberModal.html -->
<!DOCTYPE html>
<html lang="en">
-<head>
- <link rel="stylesheet" href="../ideaBank/ideaBank.css" />
+<head>
+ <link rel="stylesheet" href="../ideaBank/ideaBank.css" />
<link rel="stylesheet" href="../ideaBank/ideideaCard.css" />
<link rel="stylesheet" href="../initiateForbattringsarbete/initiateIdea.css" />
<meta charset="UTF-8">
@@ -25,9 +25,9 @@
<!-- Modal -->
<div class="modal fade" id="addMemberModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
- <div class="modal-content">
+ <div class="modal-content" style = "color: black;">
<div class="modal-header">
- <h5 class="modal-title" id="exampleModalLongTitle">Ändra medlemmar kopplade till projektet</h5>
+ <h5 class="modal-title" id="exampleModalLongTitle" style = "color : black">Ändra medlemmar kopplade till projektet</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" id="upperCloseMemberModal">
<span aria-hidden="true">×</span>
</button>
@@ -65,8 +65,8 @@
<div class="selectedEmployees" id="selectedEmployees"></div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" id="lowerCloseMemberModal">Close</button>
- <button type="button" class="btn btn-primary" id="selectEmployeeSaveButton">Save changes</button>
+ <button type="button" class="btn btn-secondary" style = "width: 150px;" data-dismiss="modal" id="lowerCloseMemberModal">Stäng</button>
+ <button type="button" class="btn btn-secondary" style = "width: 150px;"id="selectEmployeeSaveButton">Spara Ändringar</button>
</div>
</div>
</div>
diff --git a/client/projectPage/projectPage.ts b/client/projectPage/projectPage.ts
index e0afe031..6a7c5cd2 100644
--- a/client/projectPage/projectPage.ts
+++ b/client/projectPage/projectPage.ts
@@ -501,11 +501,15 @@ function getDivWithIdFromHTML(
export async function loadMemberModal(projectId: string) {
const modalContent = await getDivWithIdFromHTML('../projectPage/addMemberModal.html', '#addMemberModal');
+ var link = document.createElement('link');
+ link.rel = 'stylesheet';
+ link.type = 'text/css';
+ link.href = '../initiateForbattringsarbete/initiateIdea.css';
- //clear selected employees
setSelectedEmployeesEmpty();
if (modalContent) {
+ $('#container-fluid').append(link);
$('#container-fluid').append(modalContent);
($(modalContent) as any).modal('show');
--
GitLab