diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index 2ae463e74f1c8194e9315c4e416649047f69de06..9bfd1dae3b40fd388de33f8cbc38dc2c33a7ed45 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -16,11 +16,9 @@ <mat-spinner *ngIf="isLoadingResults"></mat-spinner> </div> <div class="row" style="margin:0px;"> - <div class="col-md-9 col-xs-9"> - <app-filters-tool #filtersTool [currentBasketInfo]="currentBasketInfo" [listProperties]="this.listProperties" [snavR]="snav2" (refreshEvent)="refreshDao()"></app-filters-tool> - </div> - <div class="col-md-3 col-xs-3"> - <mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator> + <div class="col-md-12" style="display:flex;"> + <app-filters-tool style="flex:1;" #filtersTool [currentBasketInfo]="currentBasketInfo" [listProperties]="this.listProperties" [snavR]="snav2" (refreshEvent)="refreshDao()"></app-filters-tool> + <mat-paginator [length]="resultsLength" [pageSize]="10" class="paginatorResultList"></mat-paginator> </div> </div> diff --git a/src/frontend/app/list/basket-list.component.scss b/src/frontend/app/list/basket-list.component.scss index 2761e53d3e4728177bbc501c295268a1fdb21c96..33ceee990fd9351d0a95b82fdd7e7c6d81575fcc 100644 --- a/src/frontend/app/list/basket-list.component.scss +++ b/src/frontend/app/list/basket-list.component.scss @@ -56,6 +56,12 @@ mat-toolbar { text-align: right; } +.paginatorResultList { + ::ng-deep.mat-paginator-container { + min-height: auto; + } +} + .chrono { color: #666; &-mobile { diff --git a/src/frontend/app/list/filters/filters-tool.component.html b/src/frontend/app/list/filters/filters-tool.component.html index 5390a7b514ec41b18d1ee569a99b8264f82a5af3..73ae1f0f06544580055d4ba83810cef8c396c6c2 100644 --- a/src/frontend/app/list/filters/filters-tool.component.html +++ b/src/frontend/app/list/filters/filters-tool.component.html @@ -1,6 +1,6 @@ <mat-button-toggle-group #group="matButtonToggleGroup" class="envFilter" multiple> <mat-checkbox color="primary" style="margin: 10px;" title="Sélectionner tous les courriers de la bannette"></mat-checkbox> - <form [formGroup]="stateForm" [style.width.px]="300"> + <form [formGroup]="stateForm" [style.flex]="1"> <mat-form-field appearance="outline" floatLabel="never" [style.fontSize.px]="10"> <input class="metaSearch" type="text" matInput placeholder="Recherche un document" formControlName="stateGroup" [matAutocomplete]="autoGroup" (focus)="initFilters()" (keyup.enter)="metaSearch($event);"> @@ -27,7 +27,7 @@ (change)="setFilters($event, 'delayed')"> <mat-icon fontSet="fas" fontIcon="fa-stopwatch fa-2x"></mat-icon> </mat-button-toggle> - <mat-form-field appearance="outline" [style.fontSize.px]="10" style="width:200px !important;"> + <mat-form-field appearance="outline" [style.fontSize.px]="10" style="flex: 1;"> <mat-label>{{lang.orderBy}}</mat-label> <mat-select [(ngModel)]="this.listProperties.order" (selectionChange)="updateFilters()"> <mat-option value="" style="text-align: center;">{{lang.defaultOrder}}</mat-option> diff --git a/src/frontend/app/list/filters/filters-tool.component.scss b/src/frontend/app/list/filters/filters-tool.component.scss index 1b756664abcde93b0ef13f5037204e61e912ce0d..82eb42f01ab7bde87b5e56311df28606c0a1535d 100644 --- a/src/frontend/app/list/filters/filters-tool.component.scss +++ b/src/frontend/app/list/filters/filters-tool.component.scss @@ -1,4 +1,5 @@ .envFilter { + width: 100%; height: 40px; mat-icon{ diff --git a/src/frontend/app/menu/main-header.component.html b/src/frontend/app/menu/main-header.component.html index 4ffef024abe4bea8a46ba6e5788696a75001be04..fcd483cfc94f50f9c37b211bc5551908a51420a0 100755 --- a/src/frontend/app/menu/main-header.component.html +++ b/src/frontend/app/menu/main-header.component.html @@ -3,7 +3,7 @@ <mat-icon class="fa fa-bars fa-2x"></mat-icon> </button> <a href="#" title="{{lang.home}}" *ngIf="!mobileMode" style="margin-right: 30px;"><mat-icon class="maarchLogo" svgIcon="maarchLogo"></mat-icon></a> - <h1 class="admin-toolbar-title" *ngIf="!mobileMode" [innerHTML]="headerService.headerMessage"> + <h1 class="admin-toolbar-title" [innerHTML]="headerService.headerMessage"> </h1><span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span> <span style="flex: 1 1 auto;"></span> <search-home></search-home>