Skip to content
Snippets Groups Projects
Commit 6407c1c3 authored by Johan Kristiansson's avatar Johan Kristiansson
Browse files

Css fix on addmembermodal

parent c8f31235
No related branches found
No related tags found
No related merge requests found
Pipeline #113177 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
client/ideaBank/ideaCard.css
+ 1
− 0
View file @ 6407c1c3
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 13px; font-size: 13px;
color: black;
} }
.ideaCardFontComments { .ideaCardFontComments {
font-family: "Roboto", sans-serif; font-family: "Roboto", sans-serif;
......
client/projectPage/addMemberModal.html
+ 6
− 6
View file @ 6407c1c3
<!-- addMemberModal.html --> <!-- addMemberModal.html -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<link rel="stylesheet" href="../ideaBank/ideaBank.css" /> <link rel="stylesheet" href="../ideaBank/ideaBank.css" />
<link rel="stylesheet" href="../ideaBank/ideideaCard.css" /> <link rel="stylesheet" href="../ideaBank/ideideaCard.css" />
<link rel="stylesheet" href="../initiateForbattringsarbete/initiateIdea.css" /> <link rel="stylesheet" href="../initiateForbattringsarbete/initiateIdea.css" />
<meta charset="UTF-8"> <meta charset="UTF-8">
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="addMemberModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true"> <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-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content" style = "color: black;">
<div class="modal-header"> <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"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="upperCloseMemberModal">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<div class="selectedEmployees" id="selectedEmployees"></div> <div class="selectedEmployees" id="selectedEmployees"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" id="lowerCloseMemberModal">Close</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-primary" id="selectEmployeeSaveButton">Save changes</button> <button type="button" class="btn btn-secondary" style = "width: 150px;"id="selectEmployeeSaveButton">Spara Ändringar</button>
</div> </div>
</div> </div>
</div> </div>
......
client/projectPage/projectPage.ts
+ 5
− 1
View file @ 6407c1c3
...@@ -501,11 +501,15 @@ function getDivWithIdFromHTML( ...@@ -501,11 +501,15 @@ function getDivWithIdFromHTML(
export async function loadMemberModal(projectId: string) { export async function loadMemberModal(projectId: string) {
const modalContent = await getDivWithIdFromHTML('../projectPage/addMemberModal.html', '#addMemberModal'); 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(); setSelectedEmployeesEmpty();
if (modalContent) { if (modalContent) {
$('#container-fluid').append(link);
$('#container-fluid').append(modalContent); $('#container-fluid').append(modalContent);
($(modalContent) as any).modal('show'); ($(modalContent) as any).modal('show');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment