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 461d7ecf9a8f2b53055292017bc35cae6d5dd5c9..f47cc08c93a436ee36aba0c690201b8615d4ed7d 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 @@ -82,7 +82,7 @@ <!-- Value Column --> <ng-container matColumnDef="valeurFixe"> <th mat-header-cell *matHeaderCellDef class="pastis-font-table-header pastis-col">Valeur fixe</th> - <td mat-cell *matCellDef="let element;index as i" class="pastis-metadata-table-col-large"> + <td mat-cell *matCellDef="let element;index as i" class="pastis-metadata-table-col-medium"> <ng-container [ngSwitch]="getMetadataInputType(element)"> <ng-container *ngSwitchCase="'date'"> <input [ngModel]="element.valeurFixe" theme="dp-material" class="value-text-area pastis-table-content" @@ -127,7 +127,6 @@ class="comment-text-area "> </textarea> - <!--Menu options--> <mat-menu #menu="matMenu" [overlapTrigger]="false" class="pastis-menu-item-vitam" xPosition="before" yPosition="below"> @@ -155,19 +154,21 @@ <span class="text normal">Supprimer</span> </button> </mat-menu> - - <button id="menuBtn" *ngIf="isRowHovered(element.id)" mat-icon-button [matMenuTriggerFor]="menu" - (click)="onButtonClicked(element.id,$event)" disableRipple="true" (menuOpened)="rowIndex = i" - (menuClosed)="rowIndex = 100" - [ngClass]="{'pastis-btn-metadata-options-active': isButtonClicked(element.id,matDataSource.data[rowIndex]), + <div> + <button id="menuBtn" *ngIf="isRowHovered(element.id)" mat-icon-button [matMenuTriggerFor]="menu" + (click)="onButtonClicked(element.id,$event)" disableRipple="true" (menuOpened)="rowIndex = i" + (menuClosed)="rowIndex = 100" + [ngClass]="{'pastis-btn-metadata-options-active': isButtonClicked(element.id,matDataSource.data[rowIndex]), 'pastis-btn-metadata-options': !isButtonClicked(element.id,matDataSource.data[rowIndex]) }"> - <mat-icon - [ngClass]="{'pastis-ico-menu-active': isButtonClicked(element.id,matDataSource.data[rowIndex]), + <mat-icon + [ngClass]="{'pastis-ico-menu-active': isButtonClicked(element.id,matDataSource.data[rowIndex]), 'pastis-ico-menu-inactive': !isButtonClicked(element.id,matDataSource.data[rowIndex])}"> - {{isButtonClicked(element.id, matDataSource.data[rowIndex]) ? 'close' : 'more_horiz'}} - </mat-icon> - </button> + {{isButtonClicked(element.id, matDataSource.data[rowIndex]) ? 'close' : 'more_horiz'}} + </mat-icon> + </button> + </div> </td> + </ng-container> <tr mat-header-row *matHeaderRowDef="displayedColumns;sticky: true" class="pastis-table-row-header"></tr> 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 ea48af5047ad31969c8c44bdd12637a80c3cf5ae..8c7c654780c8ca1518e1e8ce33672437e86f5e56 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 @@ -130,6 +130,7 @@ td { padding: 0px; width: 80%; color:#212121; + height:40px; @extend .pastis-table-input-border; display: flex; align-items: center; diff --git a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss index 6aea913fb9d68028c025410963bba03afa4d3096..cd0865b1e6b322df362288b0b1590bfda96aec4c 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss +++ b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss @@ -96,7 +96,7 @@ .pastis-col{ text-align: left; - + } .pastis-col:first-child { @@ -111,9 +111,16 @@ .pastis-metadata-table-col-large { @extend .pastis-col; - width: 200px; - height: 60px; - + width: 203px; + height: 50px; + +} + +.pastis-metadata-table-col-medium { + @extend .pastis-col; + width: 140px; + height: 50px; + } @@ -121,7 +128,7 @@ .pastis-metadata-table-col-small { @extend .pastis-col; width: 120px; - height: 60px; + height: 50px; } @@ -136,7 +143,7 @@ } .pastis-ico-arrow-right{ - + font-size: 14px; line-height: 22px; margin-left: 10px; @@ -166,7 +173,7 @@ ::-webkit-scrollbar-track { background: #E6E6E6; } - + /* Handle */ ::-webkit-scrollbar-thumb { background: #F7F8FB; @@ -176,7 +183,7 @@ /* Handle on hover */ ::-webkit-scrollbar-thumb:hover { - background: #747272; ; + background: #747272; ; } /*For non webkit browsers, such as Firefox/* @@ -359,7 +366,7 @@ box-shadow: 0px 1px 4px rgba(33, 33, 33, 0.2), 0px 2px 8px rgba(33, 33, 33, 0.05); cursor: pointer; } - + .pastis-panel-shadow-primary-500 { box-shadow: 0px 1px 4px rgba(112, 35, 130, 0.4), 0px 2px 8px rgba(112, 35, 130, 0.2);