Skip to content

Commit

Permalink
quick fix
Browse files Browse the repository at this point in the history
  • Loading branch information
biaogebusy committed Apr 21, 2024
1 parent 44ef6d4 commit ccfc9e8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<div class="container">
<div class="m-top-sm" fxLayout.lt-md="column" fxLayout.gt-sm="row">
<div class="list" fxFlex.lt-md="100" fxFlex.gt-sm="75">
<app-list [content]="list" [links]="links" [loading]="loading" (pageChange)="loadContent($event)">
<app-list [attr.data-path]="'list'" [content]="list" [links]="links" [loading]="loading"
(pageChange)="loadContent($event)">
</app-list>
</div>
<app-sidebar [ngClass.gt-sm]="'m-left-sm'" *ngIf="content.sidebar" fxFlex.lt-md="100" fxFlex.gt-sm="25"
[content]="content.sidebar"></app-sidebar>
<app-sidebar [attr.data-path]="'sidebar'" [ngClass.gt-sm]="'m-left-sm'" *ngIf="content.sidebar" fxFlex.lt-md="100"
fxFlex.gt-sm="25" [content]="content.sidebar"></app-sidebar>
</div>
</div>
</div>
</div>
9 changes: 5 additions & 4 deletions src/app/uiux/combs/list/list/list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
</div>
<ng-container *ngIf="!loading">
<ng-container *ngIf="links">
<app-showcase-3v3 [content]="item" *ngFor="let item of content; trackBy: trackByFn">
<app-showcase-3v3 [attr.data-path]="i" [content]="item"
*ngFor="let item of content;index as i; trackBy: trackByFn">
</app-showcase-3v3>
<app-pagination-links (pageChange)="onPageChange($event)" [links]="links"></app-pagination-links>
</ng-container>
<ng-container *ngIf="pager">
<app-showcase-3v3 [content]="item" *ngFor="let item of content | paginate: { itemsPerPage: pager.itemsPerPage || 20, currentPage: p }; trackBy:
trackByFn">
<app-showcase-3v3 [attr.data-path]="i" [content]="item" *ngFor="let item of content | paginate: { itemsPerPage: pager.itemsPerPage || 20, currentPage: p }; trackBy:
trackByFn; index as i">
</app-showcase-3v3>
<app-pagination (pageChange)="p = $event"></app-pagination>
</ng-container>
</ng-container>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
<div class="showcase-inner teaser" fxLayout.lt-md="column" fxLayout.gt-sm="row" fxFlex="100" fxLayoutGap.lt-md="0"
fxLayoutGap.gt-xs="3rem">
<ng-container *ngIf="content.feature">
<app-feature-box fxFlex.lt-md="100" fxFlex.gt-sm="40" [content]="content.feature" *ngIf="isShow">
<app-feature-box [attr.data-path]="'feature'" fxFlex.lt-md="100" fxFlex.gt-sm="40" [content]="content.feature"
*ngIf="isShow">
</app-feature-box>
</ng-container>
<div [ngClass]="isShow ? 'm-left-sm' : ''" fxFlex.lt-md="100"
fxFlex.gt-sm="{{content.showImage && content.feature?'60':'100'}}">
<h2 class="title">
<app-link [content]="content.title"></app-link>
<app-link [attr.data-path]="'title'" [content]="content.title"></app-link>
</h2>
<ul class="post-meta-info" fxLayout fxLayoutAlign="start start">
<li *ngIf="content.date" fxLayoutAlign="center center">
Expand All @@ -31,7 +32,7 @@ <h2 class="title">
<div class="shortdesc" [innerHTML]="content.body |stripTags|trim|shorten:150:'...'">
</div>
<div class="m-top-sm" *ngIf="content.details">
<app-btn [content]="content.details"></app-btn>
<app-btn [attr.data-path]="'details'" [content]="content.details"></app-btn>
</div>
</div>
</div>
Expand Down

0 comments on commit ccfc9e8

Please sign in to comment.