added Empty to ThemePalette

positive-js · Nov 2, 2018 · c2b9b0d · c2b9b0d
1 parent c4536a0
commit c2b9b0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/lib/core/common-behaviors/color.ts b/src/lib/core/common-behaviors/color.ts
@@ -18,7 +18,8 @@ export enum ThemePalette {
     Primary = 'primary',
     Second = 'second',
     Error = 'error',
-    Default = 'second'
+    Default = 'second',
+    Empty = ''
 }
 
 /** Mixin to augment a directive with a `color` property. */

diff --git a/src/lib/icon/_icon-theme.scss b/src/lib/icon/_icon-theme.scss
@@ -12,8 +12,6 @@
     $foreground: map-get($theme, foreground);
     $background: map-get($theme, background);
 
-        background: map-get($background, background);;
-
     $primary-color: mc-color($primary, 400);
     $second-color: mc-color($second);
     $error-color: mc-color($error);
@@ -46,10 +44,6 @@
                 color: $error-color;
             }
         }
-
-        &:not(.mc-primary):not(.mc-second):not(.mc-error) {
-            color: map-get($foreground, default-icon);
-        }
     }
 
     // Облегченные серые иконки less-contrast-icon нужны тогда, когда действие, которое они делают не дефолтное и

diff --git a/src/lib/icon/icon.component.ts b/src/lib/icon/icon.component.ts
@@ -7,7 +7,7 @@ import {
     ViewEncapsulation
 } from '@angular/core';
 
-import { mixinColor, CanColor, CanColorCtor } from '@ptsecurity/mosaic/core';
+import { mixinColor, CanColor, CanColorCtor, ThemePalette } from '@ptsecurity/mosaic/core';
 
 
 @Directive({
@@ -21,7 +21,7 @@ export class McIconBase {
     constructor(public _elementRef: ElementRef) {}
 }
 
-export const _McIconMixinBase: CanColorCtor & typeof McIconBase = mixinColor(McIconBase);
+export const _McIconMixinBase: CanColorCtor & typeof McIconBase = mixinColor(McIconBase, ThemePalette.Empty);
 
 
 @Component({