diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.scss index 0d0612d59e99b4f9cee08b084e4419da1a8e8c4c..5c908814a170fa8b65679bedc478454d3e263e31 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.scss @@ -138,7 +138,18 @@ } .mat-tab-group { - max-height: 500px; + @media screen and (min-height: 950px){ + max-height: 850px; + } + @media screen and (min-height: 700px) and (max-height: 950px){ + max-height: 500px !important; + } + @media screen and (min-height: 550px) and (max-height: 700px){ + max-height: 450px; + } + @media screen and (max-height: 550px){ + max-height: 350px; + } } .mat-tab-body .mat-tab-body-active { diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index f2be850a295b49ee004d90d8902f9b0b266db6bf..560736f35f3b024194e16dfe31aa1b255c998f98 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -50,10 +50,17 @@ </div> </div> <div class="button-filter"> - <vitamui-common-banner [searchbarPlaceholder]="'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.SEARCH_PLACEHOLDER' | translate" (search)="applyFilterTier($event)" > + + <vitamui-common-banner [searchbarPlaceholder]="'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.SEARCH_PLACEHOLDER' | translate" (search)="applyFilterTier($event)" > + <!--Button add metadata--> + <button *ngIf="checkElementType()" class="btn primary ml-5" style="text-transform: uppercase;" + (click)="onAddNode()">{{resolveButtonLabel(clickedNode)}} + </button> </vitamui-common-banner> </div> + + <!--Metatada table container--> <div class="pastis-table-container"> <table mat-table [dataSource]="matDataSource" *ngIf="shouldLoadMetadataTable(); else complexElementWithouChild" @@ -217,12 +224,6 @@ class="complex-element-no-child"> {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.MESSAGE_METADONNEE_SANS_FILLES.PARTIEUN' | translate}} {{clickedNode.name}} {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.MESSAGE_METADONNEE_SANS_FILLES.PARTIEDEUX' | translate}} </div> </ng-template> - <!--Button add metadata--> - <div class="button-container"> - <button *ngIf="checkElementType()" class="btn primary" style="text-transform: uppercase;" - (click)="onAddNode()">{{resolveButtonLabel(clickedNode)}} - </button> - <br><br> - </div> + </mat-sidenav-content> </mat-sidenav-container> diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss index 3eb9b9f56d87d902b7389f2a59002083e5721434..e92348c611d059f0cd964e4bc5c69a148701a7cb 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss @@ -23,12 +23,16 @@ td { .button-filter { margin-top: 67px; - margin-left: 7%; + margin-left: 74px; margin-bottom: -40px; height: 80px !important; position: relative !important; - width: 38%; + width: 60%; + +} +.mat-drawer-content{ + height: max-content !important; } .item-metadata { @@ -336,7 +340,7 @@ tr:hover .pastis-btn-appear { .pastis-table-container { overflow-x: hidden; - max-height: 425px; + //max-height: 425px; top: 30px; margin-left: 74px; position: relative; @@ -524,7 +528,7 @@ dp-day-calendar .dp-day-calendar-container { text-align: left; } .mat-sidenav-content{ - height: 800px; + padding-bottom: 30px; } .pastis-menu-item-vitam{