diff --git a/src/app/carto/carto.component.html b/src/app/carto/carto.component.html index 7b598ceaf7fce42eda4932ed701158db3aaacc73..887e418bf49f659574952a231539671a3bd8d67d 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()" /> 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 23a974569b183bdfdd609485e47c4c3137a9c1af..c90fd64f796eaf446a6a1f2a2937e1e859e551ac 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/button/button.component.html b/src/app/shared/components/v3/button/button.component.html index ca37ddecd6b751764de09577de639339230b30b7..57b740107c858d064f5c5b6d0f7d762914620eeb 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 26f087ef4eb85b093dedc51adc2784915f7bdb69..58c195f635c019b32af9b44e29257b90d34deac8 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>(); 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 eeed31fa751b8a641f301b1a5589d6d71e9d6e59..cb2f3f64e8234541679da7cc5ed27be9a1fb0bbe 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 e2e565ce975832c53f5cf1c573a21bb30335637d..5e7d0dea305d39bb3ddd0364e6b871d83604b5e7 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>(); 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 2ff8504e59bcc5f865cdbee0c9fe10dcb18c4548..8bb5c761093960b38b520b5ce5817e92980d2864 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()"