diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html
index 4a4cb3b3b09c7a754305a84d02a8710f46b0641e..1233b3710b4811f9613515074a17b748c7b053a0 100755
--- a/src/frontend/app/basket/basket-home.component.html
+++ b/src/frontend/app/basket/basket-home.component.html
@@ -3,16 +3,16 @@
<mat-expansion-panel class="basketList" expanded *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel-header>
<mat-panel-title>
- {{lang.myBaskets}}
+ <i class="fa fa-inbox"></i> {{lang.myBaskets}}
</mat-panel-title>
</mat-expansion-panel-header>
- <mat-form-field floatLabel="never" style="padding-left:20px;padding-right:20px;">
+ <mat-form-field floatLabel="never" appearance="outline" class="basketsFilter" style="padding-left:20px;padding-right:20px;font-size: 11px;">
<input matInput placeholder="{{lang.filterBy}}" #listFilter>
</mat-form-field>
<ng-container *ngFor="let regroupedBasket of homeData.regroupedBaskets">
- <mat-icon *ngIf="regroupedBasket.baskets[0]" color="primary" mat-list-icon class="fa fa-users" style="margin-left:10px;"></mat-icon> <span *ngIf="regroupedBasket.baskets[0]" class="basketGroupTitle">{{regroupedBasket.groupDesc}}</span>
- <mat-divider *ngIf="regroupedBasket.baskets[0]"></mat-divider>
- <mat-nav-list>
+ <span *ngIf="regroupedBasket.baskets[0]" class="basketGroupTitle">{{regroupedBasket.groupDesc}}</span>
+ <mat-divider *ngIf="regroupedBasket.baskets[0]" style="width: 80%;"></mat-divider>
+ <mat-nav-list style="padding-bottom: 10px;">
<ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'">
<a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !appService.getViewMode()" mat-list-icon class="fa fa-share"></mat-icon>
diff --git a/src/frontend/app/basket/basket-home.component.scss b/src/frontend/app/basket/basket-home.component.scss
index be03463f9edc3ba360516a25bef2cbc2e28ede81..b530ac7dcb898ee48d1b3d91e261e818f8a4845e 100644
--- a/src/frontend/app/basket/basket-home.component.scss
+++ b/src/frontend/app/basket/basket-home.component.scss
@@ -1,6 +1,7 @@
@import '../../css/vars.scss';
.basketList {
+ border-radius: 0px;
box-shadow:none;
::ng-deep.mat-expansion-panel-body {
@@ -8,7 +9,10 @@
}
.mat-expansion-panel-header-title {
- color: rgba(0,0,0,0.54);
+ color: #135F7F;
+ font-weight: bold !important;
+ display: flex;
+ align-items: center;
font-size: 14px;
font-weight: 500;
}
@@ -41,7 +45,15 @@
}
.basketGroupTitle {
- color: rgba(0, 0, 0, 0.54);
+ color: $primary;
font-size: 14px;
font-weight: 500;
+ padding-left: 10px;
+}
+
+.basketsFilter {
+ ::ng-deep.mat-form-field-infix {
+ padding : 0px;
+ padding-bottom: 5px;
+ }
}
\ No newline at end of file
diff --git a/src/frontend/app/folder/folder-tree.component.html b/src/frontend/app/folder/folder-tree.component.html
index 127a26955dc35229c7f1bc72a7627a8ec76c92eb..dde21aaf2d57eb21da7e20c42cabd41a54f3dbf0 100644
--- a/src/frontend/app/folder/folder-tree.component.html
+++ b/src/frontend/app/folder/folder-tree.component.html
@@ -9,14 +9,14 @@
<a mat-list-item disableRipple [class.selectedFolder]="node.selected" (mouseenter)="showAction(node)"
(mouseleave)="hideAction(node)" (click)="selectFolder(node)">
<span style="flex:1;overflow: hidden;text-overflow: ellipsis;">
- <span class="treeLabel" [class.private]="!node.public" [title]="node.label" [class.drag]="node.drag">
- {{node.label}}
+ <span class="treeLabel" [title]="node.label" [class.drag]="node.drag">
+ {{node.label}} <i class="fa fa-users private" *ngIf="node.public" title="Dossier partagé"></i>
</span>
</span>
<button mat-icon-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation();showAction(node);"
[disabled]="!node.showAction">
<mat-icon *ngIf="node.showAction" class="folderAction fa fa-ellipsis-v"></mat-icon>
- <span *ngIf="!node.showAction">
+ <span *ngIf="!node.showAction" class="countResources">
{{node.countResources}}
</span>
</button>
@@ -42,20 +42,20 @@
<mat-tree-node cdkDropList [id]="'folder-list-'+node.id" cdkDropListConnectedTo="list-1" (cdkDropListDropped)="drop($event, node)"
(cdkDropListEntered)="dragEnter(node)" (cdkDropListExited)="node.drag=false" [@hideShow] *matTreeNodeDef="let node;when: hasChild"
matTreeNodePadding matTreeNodePaddingIndent="20px">
- <button class="expandButton" [class.private]="!node.public" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
+ <button class="expandButton" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror fa {{treeControl.isExpanded(node) ? 'fa-chevron-down' : 'fa-chevron-right'}}">
</mat-icon>
</button>
<a mat-list-item disableRipple [class.selectedFolder]="node.selected" (mouseleave)="hideAction(node)"
(mouseenter)="showAction(node)" (click)="selectFolder(node)">
<span style="flex:1;overflow: hidden;text-overflow: ellipsis;">
- <span class="treeLabel" [class.private]="!node.public" [title]="node.label" [class.drag]="node.drag">
- {{node.label}}
+ <span class="treeLabel" [title]="node.label" [class.drag]="node.drag">
+ {{node.label}} <i class="fa fa-users private" *ngIf="node.public" title="Dossier partagé"></i>
</span>
</span>
<button mat-icon-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation();" [disabled]="!node.showAction">
<mat-icon *ngIf="node.showAction" class="folderAction fa fa-ellipsis-v"></mat-icon>
- <span *ngIf="!node.showAction">
+ <span *ngIf="!node.showAction" class="countResources">
{{node.countResources}}
</span>
</button>
diff --git a/src/frontend/app/folder/folder-tree.component.scss b/src/frontend/app/folder/folder-tree.component.scss
index f4eed09bea6f5ac8ee58726b51fcd9a3237d413d..54363dfe33cee7ba60bae00812da9276ee798897 100644
--- a/src/frontend/app/folder/folder-tree.component.scss
+++ b/src/frontend/app/folder/folder-tree.component.scss
@@ -71,7 +71,7 @@ form {
.treeLabel {
white-space: pre;
- color: $primary;
+ color: rgb(102, 102, 102);
}
.drag {
@@ -85,5 +85,14 @@ form {
}
.private {
- color: $warn;
+ color: $secondary;
+}
+
+.countResources {
+ color: $primary;
+ font-weight: bold;
+}
+
+button:disabled {
+ opacity: 1;
}
\ No newline at end of file
diff --git a/src/frontend/app/folder/panel/panel-folder.component.html b/src/frontend/app/folder/panel/panel-folder.component.html
index 2fac3f028798f1fb773e49e4dd5aff57eb561a81..a601c9d76e6640b5a3fcbf683a9679ffcaaec453 100644
--- a/src/frontend/app/folder/panel/panel-folder.component.html
+++ b/src/frontend/app/folder/panel/panel-folder.component.html
@@ -1,7 +1,7 @@
<mat-expansion-panel class="folderList" expanded>
<mat-expansion-panel-header>
<mat-panel-title>
- {{lang.folders}}
+ <i class="fa fa-folder"></i> {{lang.folders}}
</mat-panel-title>
</mat-expansion-panel-header>
<folder-tree #folderTree [selectedId]="id" (refreshDocList)="refreshDocList()"></folder-tree>
diff --git a/src/frontend/app/folder/panel/panel-folder.component.scss b/src/frontend/app/folder/panel/panel-folder.component.scss
index 2d21e7d6f5f10bd2ff3f39d04357a66c3dc2b622..44c75d88e07660317364d2e30896bff5dc1c6b4f 100644
--- a/src/frontend/app/folder/panel/panel-folder.component.scss
+++ b/src/frontend/app/folder/panel/panel-folder.component.scss
@@ -8,7 +8,10 @@
}
.mat-expansion-panel-header-title {
- color: rgba(0, 0, 0, 0.54);
+ color: #135F7F;
+ font-weight: bold !important;
+ display: flex;
+ align-items: center;
font-size: 14px;
font-weight: 500;
}