From 023497f78be26a549da4072b84e9d212622c63e5 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Thu, 14 Dec 2023 17:11:12 +0100
Subject: [PATCH 1/4] add input iconColor
---
.../components/v3/button/button.component.html | 12 +++---------
.../shared/components/v3/button/button.component.ts | 3 +++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/app/shared/components/v3/button/button.component.html b/src/app/shared/components/v3/button/button.component.html
index ca37ddecd..57b740107 100644
--- a/src/app/shared/components/v3/button/button.component.html
+++ b/src/app/shared/components/v3/button/button.component.html
@@ -1,14 +1,9 @@
-<button
- [type]="type"
- [ngClass]="classes"
- [disabled]="disabled"
- (click)="action.emit($event)">
-
+<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
<app-svg-icon
*ngIf="iconName && iconPosition === 'left'"
[type]="iconFolder"
[icon]="iconName"
- [iconColor]="'currentColor'"
+ [iconColor]="iconColor"
[iconClass]="'icon-20'"
/>
{{ label }}
@@ -16,8 +11,7 @@
*ngIf="iconName && iconPosition === 'right'"
[type]="iconFolder"
[icon]="iconName"
- [iconColor]="'currentColor'"
+ [iconColor]="iconColor"
[iconClass]="'icon-20'"
/>
-
</button>
diff --git a/src/app/shared/components/v3/button/button.component.ts b/src/app/shared/components/v3/button/button.component.ts
index 26f087ef4..58c195f63 100644
--- a/src/app/shared/components/v3/button/button.component.ts
+++ b/src/app/shared/components/v3/button/button.component.ts
@@ -34,6 +34,9 @@ export class ButtonV3Component {
/** Icon name */
@Input() iconName?: string;
+ /** Icon color, defaults to none as the svg-icon does */
+ @Input() iconColor = 'none';
+
/** Click handler */
@Output() action = new EventEmitter<Event>();
--
GitLab
From bfe8a998b9ae328e1044b86f3a71b7e2ae23aa3b Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Thu, 14 Dec 2023 17:14:14 +0100
Subject: [PATCH 2/4] iconButton
---
.../v3/button/icon-button/icon-button.component.html | 2 +-
.../components/v3/button/icon-button/icon-button.component.ts | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.html b/src/app/shared/components/v3/button/icon-button/icon-button.component.html
index eeed31fa7..cb2f3f64e 100644
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.html
+++ b/src/app/shared/components/v3/button/icon-button/icon-button.component.html
@@ -1,3 +1,3 @@
<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
- <app-svg-icon [type]="iconFolder" [icon]="iconName" [iconColor]="'currentColor'" [iconClass]="'icon-20'" />
+ <app-svg-icon [type]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
</button>
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts b/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
index e2e565ce9..5e7d0dea3 100644
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
+++ b/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
@@ -25,6 +25,9 @@ export class IconButtonV3Component {
/** Icon name */
@Input() iconName: string;
+ /** Icon color, defaults to none as the svg-icon does */
+ @Input() iconColor = 'none';
+
/** Click handler */
@Output() action = new EventEmitter<Event>();
--
GitLab
From 26b1aac969acef366413e3c1782ccf496393a5fc Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Fri, 15 Dec 2023 16:43:25 +0100
Subject: [PATCH 3/4] Search-bars + equipements buttons (-) and (+) need
currentColor
---
.../structure-equipments/structure-equipments.component.html | 4 ++++
.../shared/components/v3/search-bar/search-bar.component.html | 1 +
2 files changed, 5 insertions(+)
diff --git a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
index 23a974569..c90fd64f7 100644
--- a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
+++ b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
@@ -15,6 +15,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'"
[iconName]="'hide'"
+ [iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbComputers === 0"
(click)="changeValueHandler(equipment.module.id, -1)"
@@ -35,6 +36,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'"
[iconName]="'hide'"
+ [iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbPrinters === 0"
(click)="changeValueHandler(equipment.module.id, -1)"
@@ -55,6 +57,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'"
[iconName]="'hide'"
+ [iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbScanners === 0"
(click)="changeValueHandler(equipment.module.id, -1)"
@@ -74,6 +77,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'"
[iconName]="'show'"
+ [iconColor]="'currentColor'"
[size]="'medium'"
(click)="changeValueHandler(equipment.module.id, 1)"
/>
diff --git a/src/app/shared/components/v3/search-bar/search-bar.component.html b/src/app/shared/components/v3/search-bar/search-bar.component.html
index 2ff8504e5..8bb5c7610 100644
--- a/src/app/shared/components/v3/search-bar/search-bar.component.html
+++ b/src/app/shared/components/v3/search-bar/search-bar.component.html
@@ -10,6 +10,7 @@
<app-v3-icon-button
iconFolder="ico"
iconName="search"
+ iconColor="currentColor"
size="medium"
[variant]="buttonTypeV3.PrimaryBlack"
(action)="handleSearch()"
--
GitLab
From e7fa0e4f6c474136ab6a5eee816abad2b50e4e7d Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Fri, 15 Dec 2023 16:46:47 +0100
Subject: [PATCH 4/4] Small fix on list/map button
---
src/app/carto/carto.component.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/app/carto/carto.component.html b/src/app/carto/carto.component.html
index 7b598ceaf..887e418bf 100644
--- a/src/app/carto/carto.component.html
+++ b/src/app/carto/carto.component.html
@@ -23,6 +23,7 @@
<app-v3-button
[variant]="buttonTypeEnumV3.PrimaryBlack"
[label]="isMapPhone ? 'Liste' : 'Carte'"
+ [size]="'large'"
[iconName]="isMapPhone ? 'liste' : 'map-markerButtonPhone'"
(action)="switchMapList()"
/>
--
GitLab