fix(select,input): inconsistent disabled text color (#7794)

Fixes the select and input having different disabled text colors and not taking colors from the palettes. Fixes #7793.
angular · Dec 8, 2017 · f31be6f · f31be6f
1 parent 6652667
commit f31be6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/lib/input/_input-theme.scss b/src/lib/input/_input-theme.scss
@@ -7,10 +7,9 @@
 
 @mixin mat-input-theme($theme) {
   $foreground: map-get($theme, foreground);
-  $is-dark-theme: map-get($theme, is-dark);
 
   .mat-input-element:disabled {
-    color: mat-color($foreground, secondary-text, if($is-dark-theme, 0.7, 0.42));
+    color: mat-color($foreground, disabled-text);
   }
 
   .mat-input-element {

diff --git a/src/lib/select/_select-theme.scss b/src/lib/select/_select-theme.scss
@@ -10,12 +10,6 @@
   $primary: map-get($theme, primary);
   $accent: map-get($theme, accent);
   $warn: map-get($theme, warn);
-  $is-dark-theme: map-get($theme, is-dark);
-
-  .mat-select-disabled .mat-select-value,
-  .mat-select-arrow {
-    color: mat-color($foreground, secondary-text);
-  }
 
   .mat-select-content, .mat-select-panel-done-animating {
     background: mat-color($background, card);
@@ -25,6 +19,18 @@
     color: mat-color($foreground, text);
   }
 
+  .mat-select-placeholder {
+    color: _mat-control-placeholder-color($theme);
+  }
+
+  .mat-select-disabled .mat-select-value {
+    color: mat-color($foreground, disabled-text);
+  }
+
+  .mat-select-arrow {
+    color: mat-color($foreground, secondary-text);
+  }
+
   .mat-select-panel {
     .mat-option.mat-selected:not(.mat-option-multiple) {
       background: mat-color($background, hover, 0.12);
@@ -51,17 +57,9 @@
     }
 
     .mat-select.mat-select-disabled .mat-select-arrow {
-      color: mat-color($foreground, secondary-text);
+      color: mat-color($foreground, disabled-text);
     }
   }
-
-  .mat-select.mat-select-disabled .mat-select-arrow {
-    color: mat-color($warn);
-  }
-
-  .mat-select-placeholder {
-    color: _mat-control-placeholder-color($theme);
-  }
 }
 
 @mixin mat-select-typography($config) {