master
Max 5 years ago
parent f8ad256a8f
commit 8218dd3e38

@ -49,7 +49,7 @@ infinite-scroll
<div id="complete-feed"> <div id="complete-feed">
<div id="feedlist"> <div id="feedlist">
<feed-postlist [childPostList]="parentSelectedPostList"></feed-postlist> <feed-postlist [childPostList]="parentSelectedPostList"></feed-postlist>
<div style="height: 60px;" [hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostLiked") '> <div style="height: 60px;" [hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostliked") '>
<!--<mat-spinner *ngIf='loadingNew && view === "mostLiked"' style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>--> <!--<mat-spinner *ngIf='loadingNew && view === "mostLiked"' style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>-->
<mat-spinner style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner> <mat-spinner style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>
</div> </div>

@ -41,18 +41,18 @@
<mat-icon svgIcon="logo" style="min-width: 35px;" routerLink="" class="link"></mat-icon> <mat-icon svgIcon="logo" style="min-width: 35px;" routerLink="" class="link"></mat-icon>
<span routerLink="" class="link">Greenvironment</span> <span routerLink="" class="link">Greenvironment</span>
<nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true" routerLinkActive #rla=""> <nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true" routerLinkActive #rla="">
<div [hidden]="!loggedIn"> <div *ngIf="loggedIn">
<a mat-tab-link class="link" <a mat-tab-link class="link"
*ngFor="let link of navLinksLoggedIn" *ngFor="let link of navLinksLoggedIn"
[routerLink]="link.path" [routerLink]="link.path"
(click)="activeLink = link" (click)="activeLink = link"
routerLinkActive #rla="routerLinkActive" routerLinkActive #rla="routerLinkActive"
[routerLinkActiveOptions]="{exact:true}" [routerLinkActiveOptions]="{exact:true}"
[active]="activeLink == link"> [active]="rla.isActive">
{{link.label}} {{link.label}}
</a> </a>
</div> </div>
<div [hidden]="loggedIn"> <div *ngIf="!loggedIn">
<a mat-tab-link class="link" <a mat-tab-link class="link"
*ngFor="let link of navLinks" *ngFor="let link of navLinks"
[routerLink]="link.path" [routerLink]="link.path"
@ -60,7 +60,7 @@
routerLinkActive #rla="routerLinkActive" routerLinkActive #rla="routerLinkActive"
[routerLinkActiveOptions]="{exact:true}" [routerLinkActiveOptions]="{exact:true}"
[active]="rla.isActive"> [active]="rla.isActive">
{{link.label}} {{link.label}}
</a> </a>
</div> </div>
</nav> </nav>

Loading…
Cancel
Save