From 52a834a1c6c901d63275991fd6c76adf8d30ce5c Mon Sep 17 00:00:00 2001 From: Guillaume Heurtier <guillaume.heurtier@maarch.org> Date: Fri, 10 Jan 2020 11:51:34 +0100 Subject: [PATCH] FEAT #11405 TIME 0:10 use var for follow icon color --- .../document-list/folder-document-list.component.html | 3 ++- .../document-list/folder-document-list.component.scss | 6 +++++- .../followed-list/followed-document-list.component.html | 3 ++- .../followed-list/followed-document-list.component.scss | 6 +++++- src/frontend/app/list/basket-list.component.html | 3 ++- src/frontend/app/list/basket-list.component.scss | 6 +++++- src/frontend/app/process/process.component.scss | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html index 2c4f8f38f57..5514a09d88a 100644 --- a/src/frontend/app/folder/document-list/folder-document-list.component.html +++ b/src/frontend/app/folder/document-list/folder-document-list.component.html @@ -101,7 +101,8 @@ (change)="toggleRes($event,row)" (click)="$event.stopPropagation();"> </mat-checkbox> </span> - <button mat-icon-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px; color: #F99830" + <button mat-icon-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px;" + class="followIcon" [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail"> <mat-icon [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']" style="margin-bottom: 5px;"></mat-icon> </button> diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.scss b/src/frontend/app/folder/document-list/folder-document-list.component.scss index 6ce6d16afd1..7a6af119a53 100644 --- a/src/frontend/app/folder/document-list/folder-document-list.component.scss +++ b/src/frontend/app/folder/document-list/folder-document-list.component.scss @@ -88,4 +88,8 @@ margin: 0px; color: white; } -} \ No newline at end of file +} + +.followIcon { + color: $secondary; +} diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.html b/src/frontend/app/home/followed-list/followed-document-list.component.html index 41e5dafd9ae..f48fd2a4f04 100644 --- a/src/frontend/app/home/followed-list/followed-document-list.component.html +++ b/src/frontend/app/home/followed-list/followed-document-list.component.html @@ -76,7 +76,8 @@ (change)="toggleRes($event,row)" (click)="$event.stopPropagation();"> </mat-checkbox> </span> - <button mat-icon-button (click)="$event.stopPropagation();unfollowMail(row)" style="margin-left: -25px; color: #F99830" + <button mat-icon-button (click)="$event.stopPropagation();unfollowMail(row)" style="margin-left: -25px;" + class="followIcon" title="{{lang.untrackThisMail}}"> <mat-icon class="fas fa-star" style="margin-bottom: 5px;"></mat-icon> </button> diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.scss b/src/frontend/app/home/followed-list/followed-document-list.component.scss index 6ce6d16afd1..7a6af119a53 100644 --- a/src/frontend/app/home/followed-list/followed-document-list.component.scss +++ b/src/frontend/app/home/followed-list/followed-document-list.component.scss @@ -88,4 +88,8 @@ margin: 0px; color: white; } -} \ No newline at end of file +} + +.followIcon { + color: $secondary; +} diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index 5774f08bcf3..76a78c37eed 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -118,7 +118,8 @@ (change)="toggleRes($event,row)" (click)="$event.stopPropagation();"> </mat-checkbox> </span> - <button mat-icon-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px; color: #F99830" + <button mat-icon-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px;" + class="followIcon" [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail"> <mat-icon [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']"></mat-icon> </button> diff --git a/src/frontend/app/list/basket-list.component.scss b/src/frontend/app/list/basket-list.component.scss index 9b1dfe2a015..7e95d28ac09 100644 --- a/src/frontend/app/list/basket-list.component.scss +++ b/src/frontend/app/list/basket-list.component.scss @@ -78,4 +78,8 @@ &:hover { color: $primary; } -} \ No newline at end of file +} + +.followIcon { + color: $secondary; +} diff --git a/src/frontend/app/process/process.component.scss b/src/frontend/app/process/process.component.scss index d674ae01b7e..e30a811f455 100644 --- a/src/frontend/app/process/process.component.scss +++ b/src/frontend/app/process/process.component.scss @@ -412,5 +412,5 @@ } .followIcon { - color: #F99830; + color: $secondary; } -- GitLab