Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

master
Trivernis 5 years ago committed by Gitea
commit 1ea0f714aa

@ -1,4 +1,4 @@
<div id="chat"> <!--<div id="chat">
<div id='header'> <div id='header'>
<button id="goback" (click)="goBack()"><span><i class="fa fa-arrow-left fa-3x" aria-hidden="true"></i></span></button> <button id="goback" (click)="goBack()"><span><i class="fa fa-arrow-left fa-3x" aria-hidden="true"></i></span></button>
<span class='title'>{{childChat.memberName}}</span> <span class='title'>{{childChat.memberName}}</span>
@ -13,4 +13,4 @@
<textarea #content id='input' placeholder="Write message here ..." rows='3' wrap="soft"></textarea> <textarea #content id='input' placeholder="Write message here ..." rows='3' wrap="soft"></textarea>
<button id="send" type='submit' (click)="sendMessage(content)"><span><i class="fa fa-send-o fa-2x" aria-hidden="true"></i></span></button> <button id="send" type='submit' (click)="sendMessage(content)"><span><i class="fa fa-send-o fa-2x" aria-hidden="true"></i></span></button>
</div> </div>
</div> </div>-->

@ -1,4 +1,4 @@
<div *ngIf="showChatlist"> <!--<div *ngIf="showChatlist">
<chatmanager-chatlist (showChatEvent)="showSpecialChat($event)" (showCreateChatEvent)="showNewChat($event)" [childChats]="parentChats"></chatmanager-chatlist> <chatmanager-chatlist (showChatEvent)="showSpecialChat($event)" (showCreateChatEvent)="showNewChat($event)" [childChats]="parentChats"></chatmanager-chatlist>
</div> </div>
<div *ngIf="showChat"> <div *ngIf="showChat">
@ -6,4 +6,4 @@
</div> </div>
<div *ngIf="showCreateNewChat"> <div *ngIf="showCreateNewChat">
<chatmanager-chatcontacts (goBackEvent)="goBackToChatlist($event)"></chatmanager-chatcontacts> <chatmanager-chatcontacts (goBackEvent)="goBackToChatlist($event)"></chatmanager-chatcontacts>
</div> </div>-->

@ -40,7 +40,7 @@
</button> </button>
<mat-icon svgIcon="logo" style="min-width: 35px;"></mat-icon> <mat-icon svgIcon="logo" style="min-width: 35px;"></mat-icon>
<span>Greenvironment</span> <span>Greenvironment</span>
<nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true"> <nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true" routerLinkActive #rla="">
<div [hidden]="!loggedIn"> <div [hidden]="!loggedIn">
<a mat-tab-link class="link" <a mat-tab-link class="link"
*ngFor="let link of navLinksLoggedIn" *ngFor="let link of navLinksLoggedIn"

@ -14,7 +14,6 @@
top: 0 top: 0
z-index: 999 z-index: 999
.mat-tab-nav-bar .mat-tab-nav-bar
width: 50%
height: 56px height: 56px
.mat-tab-links .mat-tab-links
height: 56px height: 56px

Loading…
Cancel
Save