Skip to content
Snippets Groups Projects
Commit 8d1b4a94 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

fix(ui): stroke icons

parent 43c0cc0c
No related branches found
No related tags found
2 merge requests!783V3.0.0,!671fix(ui): stroke icons
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<app-v3-button <app-v3-button
[variant]="buttonTypeEnumV3.PrimaryBlack" [variant]="buttonTypeEnumV3.PrimaryBlack"
[label]="isMapPhone ? 'Liste' : 'Carte'" [label]="isMapPhone ? 'Liste' : 'Carte'"
[size]="'large'"
[iconName]="isMapPhone ? 'liste' : 'map-markerButtonPhone'" [iconName]="isMapPhone ? 'liste' : 'map-markerButtonPhone'"
(action)="switchMapList()" (action)="switchMapList()"
/> />
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack" [variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'" [iconFolder]="'form'"
[iconName]="'hide'" [iconName]="'hide'"
[iconColor]="'currentColor'"
[size]="'medium'" [size]="'medium'"
[disabled]="structureForm.value.nbComputers === 0" [disabled]="structureForm.value.nbComputers === 0"
(click)="changeValueHandler(equipment.module.id, -1)" (click)="changeValueHandler(equipment.module.id, -1)"
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack" [variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'" [iconFolder]="'form'"
[iconName]="'hide'" [iconName]="'hide'"
[iconColor]="'currentColor'"
[size]="'medium'" [size]="'medium'"
[disabled]="structureForm.value.nbPrinters === 0" [disabled]="structureForm.value.nbPrinters === 0"
(click)="changeValueHandler(equipment.module.id, -1)" (click)="changeValueHandler(equipment.module.id, -1)"
...@@ -55,6 +57,7 @@ ...@@ -55,6 +57,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack" [variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'" [iconFolder]="'form'"
[iconName]="'hide'" [iconName]="'hide'"
[iconColor]="'currentColor'"
[size]="'medium'" [size]="'medium'"
[disabled]="structureForm.value.nbScanners === 0" [disabled]="structureForm.value.nbScanners === 0"
(click)="changeValueHandler(equipment.module.id, -1)" (click)="changeValueHandler(equipment.module.id, -1)"
...@@ -74,6 +77,7 @@ ...@@ -74,6 +77,7 @@
[variant]="buttonTypeEnumV3.PrimaryBlack" [variant]="buttonTypeEnumV3.PrimaryBlack"
[iconFolder]="'form'" [iconFolder]="'form'"
[iconName]="'show'" [iconName]="'show'"
[iconColor]="'currentColor'"
[size]="'medium'" [size]="'medium'"
(click)="changeValueHandler(equipment.module.id, 1)" (click)="changeValueHandler(equipment.module.id, 1)"
/> />
......
<button <button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
[type]="type"
[ngClass]="classes"
[disabled]="disabled"
(click)="action.emit($event)">
<app-svg-icon <app-svg-icon
*ngIf="iconName && iconPosition === 'left'" *ngIf="iconName && iconPosition === 'left'"
[type]="iconFolder" [type]="iconFolder"
[icon]="iconName" [icon]="iconName"
[iconColor]="'currentColor'" [iconColor]="iconColor"
[iconClass]="'icon-20'" [iconClass]="'icon-20'"
/> />
{{ label }} {{ label }}
...@@ -16,8 +11,7 @@ ...@@ -16,8 +11,7 @@
*ngIf="iconName && iconPosition === 'right'" *ngIf="iconName && iconPosition === 'right'"
[type]="iconFolder" [type]="iconFolder"
[icon]="iconName" [icon]="iconName"
[iconColor]="'currentColor'" [iconColor]="iconColor"
[iconClass]="'icon-20'" [iconClass]="'icon-20'"
/> />
</button> </button>
...@@ -34,6 +34,9 @@ export class ButtonV3Component { ...@@ -34,6 +34,9 @@ export class ButtonV3Component {
/** Icon name */ /** Icon name */
@Input() iconName?: string; @Input() iconName?: string;
/** Icon color, defaults to none as the svg-icon does */
@Input() iconColor = 'none';
/** Click handler */ /** Click handler */
@Output() action = new EventEmitter<Event>(); @Output() action = new EventEmitter<Event>();
......
<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 [type]="iconFolder" [icon]="iconName" [iconColor]="'currentColor'" [iconClass]="'icon-20'" /> <app-svg-icon [type]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
</button> </button>
...@@ -25,6 +25,9 @@ export class IconButtonV3Component { ...@@ -25,6 +25,9 @@ export class IconButtonV3Component {
/** Icon name */ /** Icon name */
@Input() iconName: string; @Input() iconName: string;
/** Icon color, defaults to none as the svg-icon does */
@Input() iconColor = 'none';
/** Click handler */ /** Click handler */
@Output() action = new EventEmitter<Event>(); @Output() action = new EventEmitter<Event>();
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<app-v3-icon-button <app-v3-icon-button
iconFolder="ico" iconFolder="ico"
iconName="search" iconName="search"
iconColor="currentColor"
size="medium" size="medium"
[variant]="buttonTypeV3.PrimaryBlack" [variant]="buttonTypeV3.PrimaryBlack"
(action)="handleSearch()" (action)="handleSearch()"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment