From 450d886087709ef02fa49a6ce456e6fc04200cb2 Mon Sep 17 00:00:00 2001
From: descamps <descamps@cines.fr>
Date: Fri, 28 May 2021 17:55:36 +0200
Subject: [PATCH] KDE - 28/05/2021 - Taille tableau WIP
---
.../file-tree-metadata.component.html | 25 ++++++++++---------
.../file-tree-metadata.component.scss | 1 +
.../pastis/src/assets/css/_layout.scss | 25 ++++++++++++-------
3 files changed, 30 insertions(+), 21 deletions(-)
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 461d7ecf9..f47cc08c9 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 ea48af504..8c7c65478 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 6aea913fb..cd0865b1e 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);
--
GitLab