diff --git a/client/ideaBank/ideaCard.css b/client/ideaBank/ideaCard.css index 6ecbb7a29a8d10f82cd4751fb482c4794f572f91..d7b7e05e8d0151f232130badc0f1526b42d216f9 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 a9be95d8284201f8513f68aad619f0bd0c1ca70e..d3b794b231a7d82e30d08c0d93e0ab335f45acee 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 e0afe031899a3979bdba65bd9438faede7598fc3..6a7c5cd27e3ae5765539eeef1ca6c12bd5711c15 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');