hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 20:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

#895 revert changes fix layout

Browse Source
This commit is contained in:
Dániel Péter Sipos
2020-10-16 17:12:25 +02:00
parent 3d1ffa6738
commit 9a324ba456
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/shared/object-grid/object-grid.component.html
View File

@@ -11,10 +11,10 @@
(sortDirectionChange)="onSortDirectionChange($event)" (sortDirectionChange)="onSortDirectionChange($event)"
(sortFieldChange)="onSortFieldChange($event)" (sortFieldChange)="onSortFieldChange($event)"
(paginationChange)="onPaginationChange($event)"> (paginationChange)="onPaginationChange($event)">
<div class="container" *ngIf="objects?.hasSucceeded"> <div class="card-columns row" *ngIf="objects?.hasSucceeded">
<div class=" card-columns row" *ngFor="let column of (columns$ | async)" @fadeIn> <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
<div class="card-column col-md-4 col-12" *ngFor="let object of column"> <div class="card-element" *ngFor="let object of column">
<ds-listable-object-component-loader class="card-element" [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader> <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
</div> </div>
</div> </div>
</div> </div>

11
src/app/shared/object-grid/object-grid.component.ts
View File

@@ -172,18 +172,13 @@ export class ObjectGridComponent implements OnInit {
const result = []; const result = [];
let index = 0;
page.forEach((obj: ListableObject, i: number) => { page.forEach((obj: ListableObject, i: number) => {
const colNb = i % nbColumns;
if (i % nbColumns === 0 && i > 0) { let col = result[colNb];
index++;
}
let col = result[index];
if (hasNoValue(col)) { if (hasNoValue(col)) {
col = []; col = [];
} }
result[index] = [...col, obj]; result[colNb] = [...col, obj];
}); });
return result; return result;
} else { } else {