From 444239a5cfb9ced0a47e8983bda9b16cf3807e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?= Date: Thu, 12 Apr 2018 14:12:17 -0400 Subject: [PATCH] fix(*): fix hover button if disabled --- src/lib/layer/layer-item/layer-item.component.html | 4 ++-- src/lib/layer/layer-item/layer-item.component.ts | 6 +----- src/themes/deeppurple-amber.styl | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lib/layer/layer-item/layer-item.component.html b/src/lib/layer/layer-item/layer-item.component.html index e90460f6b9..6d988bdef5 100644 --- a/src/lib/layer/layer-item/layer-item.component.html +++ b/src/lib/layer/layer-item/layer-item.component.html @@ -16,7 +16,7 @@

filter_list @@ -29,7 +29,7 @@

diff --git a/src/lib/layer/layer-item/layer-item.component.ts b/src/lib/layer/layer-item/layer-item.component.ts index 0c0e39010b..1f68749082 100644 --- a/src/lib/layer/layer-item/layer-item.component.ts +++ b/src/lib/layer/layer-item/layer-item.component.ts @@ -35,11 +35,7 @@ export class LayerItemComponent implements OnDestroy { private _edition: boolean = false; @Input() - get color() { - this._color = this.layer.visible ? 'primary' : 'background'; - return this._color; - } - + get color() { return this._color; } set color(value: string) { this._color = value; } diff --git a/src/themes/deeppurple-amber.styl b/src/themes/deeppurple-amber.styl index 5b066a58a7..51dd7906d8 100644 --- a/src/themes/deeppurple-amber.styl +++ b/src/themes/deeppurple-amber.styl @@ -34,11 +34,11 @@ mat-progress-spinner path { stroke: $primary-color; } -button.mat-icon-button.mat-primary:hover { +button.mat-icon-button.mat-primary:enabled:hover { color: #4300b8; } -button.mat-icon-button.mat-warn:hover { +button.mat-icon-button.mat-warn:enabled:hover { color: #ff1100; }