Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2018-05-30 21:04:56 +09:00
commit 50ea7ecacb
2 changed files with 13 additions and 9 deletions

View File

@ -5,13 +5,13 @@
<i class="material-icons">home</i> <i class="material-icons">home</i>
</a> </a>
</li> </li>
<li>/</li> <li>&nbsp;/&nbsp;</li>
<ng-template ngFor let-item let-last="last" [ngForOf]="items"> <ng-template ngFor let-item let-last="last" [ngForOf]="items">
<li> <li>
<a [routerLink]="item.routerLink" *ngIf="item.routerLink">{{item.label}}</a> <a [routerLink]="item.routerLink" *ngIf="item.routerLink">{{item.label}}</a>
<ng-container *ngIf="!item.routerLink">{{item.label}}</ng-container> <ng-container *ngIf="!item.routerLink">{{item.label}}</ng-container>
</li> </li>
<li *ngIf="!last">/</li> <li *ngIf="!last">&nbsp;/&nbsp;</li>
</ng-template> </ng-template>
</ul> </ul>
</div> </div>

View File

@ -1,3 +1,5 @@
<div class="ui-g-12">
<div class="ui-g-12">
<div class="footer"> <div class="footer">
<div class="card clearfix"> <div class="card clearfix">
<span class="footer-text-left">Loafle</span> <span class="footer-text-left">Loafle</span>
@ -7,3 +9,5 @@
</span> </span>
</div> </div>
</div> </div>
</div>
</div>