diff --git a/client/src/app/shared/animations.ts b/client/src/app/shared/animations.ts index 4c11aa4e9..03399235a 100644 --- a/client/src/app/shared/animations.ts +++ b/client/src/app/shared/animations.ts @@ -43,7 +43,7 @@ export const pageTransition = trigger('pageTransition', [ group([ /** Staggered appearing = "one after another" */ query(':enter mat-card', stagger(50, fadeMoveIn), { optional: true }), - query(':enter mat-row', stagger(30, fadeMoveIn), { optional: true }) + query(':enter mat-row', fadeMoveIn, { optional: true }) ]) ]) ]); diff --git a/client/src/app/shared/components/head-bar/head-bar.component.scss b/client/src/app/shared/components/head-bar/head-bar.component.scss index 51f47aa61..bf61579a1 100644 --- a/client/src/app/shared/components/head-bar/head-bar.component.scss +++ b/client/src/app/shared/components/head-bar/head-bar.component.scss @@ -1,5 +1,6 @@ .head-button { position: fixed; + z-index: 10; // should always be in top of everything else right: 25px; bottom: 25px; } diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.html b/client/src/app/shared/components/list-view-table/list-view-table.component.html index 214da947b..f389d9de7 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.html +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.html @@ -11,7 +11,6 @@
- +
diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.ts index d8957635a..402eb4a37 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.ts +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.ts @@ -11,7 +11,9 @@ import { } from '@angular/core'; import { BaseViewModel } from 'app/site/base/base-view-model'; +import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model'; import { BaseSortListService } from 'app/core/ui-services/base-sort-list.service'; +import { BaseViewModelWithContentObject } from 'app/site/base/base-view-model-with-content-object'; import { PblDataSource, columnFactory, PblNgridComponent, createDS } from '@pebula/ngrid'; import { BaseFilterListService } from 'app/core/ui-services/base-filter-list.service'; import { Observable } from 'rxjs'; @@ -196,7 +198,7 @@ export class ListViewTableComponent imple */ public async ngOnInit(): Promise { super.setTitle('Motions'); - const storedView = await this.storage.get('motionListView'); this.configService .get('motions_statutes_enabled') @@ -227,7 +226,9 @@ export class MotionListComponent extends ListViewBaseComponent imple this.categoryRepo.getViewModelListObservable().subscribe(cats => { this.categories = cats; if (cats.length > 0) { - this.selectedView = storedView || 'tiles'; + this.storage.get('motionListView').then(savedView => { + this.selectedView = savedView ? savedView : 'tiles'; + }); } else { this.selectedView = 'list'; } diff --git a/client/src/styles.scss b/client/src/styles.scss index cdaa30f02..8acd94923 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -69,6 +69,11 @@ display: inherit; } } + + /** Custom themes for NGrid. Could be an own file if it gets more */ + .pbl-ngrid-container { + background: mat-color($background, card); + } } .openslides-dark-theme, @@ -647,6 +652,10 @@ button.mat-menu-item.selected { .virtual-scroll-full-page { height: calc(100vh - 64px); } + + .virtual-scroll-with-head-bar { + height: calc(100vh - 125px); + } } /* medium */