Skip to content
Snippets Groups Projects
Commit b40c1a35 authored by Jakob Karevold Grønhaug's avatar Jakob Karevold Grønhaug
Browse files

Merge branch 'group-chat' into 'master'

move groupchats above users

See merge request !7
parents c5d922c8 6007e8f8
No related branches found
No related tags found
1 merge request!7move groupchats above users
Pipeline #158817 passed
......@@ -29,13 +29,15 @@
<h3> Samtaler <i id="dropdownIcon" class="fas fa-caret-down"></i></h3>
</div>
<ul id="groupChatList">
</ul>
<ul id="userList">
<li onclick="openNewGroupChatForm();"><i class="fas fa-plus userIcon"></i>Ny Gruppechat</li>
<li onclick="openCalculator(); toggleUserList();"><i class="fas fa-user userIcon"></i>Kalkulator</li>
</ul>
<ul id="groupChatList">
</ul>
<div class="popup" id="formpopup">
<form class="popupContainer" autocomplete="off" onsubmit="createGroupChat(event); toggleUserList();">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment