From 1a60a7a6907c85e38fdee956807d0ca76719add2 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 17 Apr 2018 22:53:50 -0400
Subject: [PATCH] fix(select,autocomplete): mat-option theme not being applied
 correctly when nested inside a selector (#10889)

Fixes the theme for the individual `mat-option` instances producing the wrong selector when it's nested inside a selector, e.g.

```scss
.dark-theme {
  @include angular-material-theme($dark-theme);
}
```
---
 src/lib/core/option/_option-theme.scss | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/core/option/_option-theme.scss b/src/lib/core/option/_option-theme.scss
index 0c423048b00..38c37772f25 100644
--- a/src/lib/core/option/_option-theme.scss
+++ b/src/lib/core/option/_option-theme.scss
@@ -17,18 +17,6 @@
       background: mat-color($background, hover);
     }
 
-    .mat-primary &.mat-selected:not(.mat-option-disabled) {
-      color: mat-color($primary);
-    }
-
-    .mat-accent &.mat-selected:not(.mat-option-disabled) {
-      color: mat-color($accent);
-    }
-
-    .mat-warn &.mat-selected:not(.mat-option-disabled) {
-      color: mat-color($warn);
-    }
-
     // In multiple mode there is a checkbox to show that the option is selected.
     &.mat-selected:not(.mat-option-multiple):not(.mat-option-disabled) {
       background: mat-color($background, hover);
@@ -43,6 +31,18 @@
       color: mat-color($foreground, hint-text);
     }
   }
+
+  .mat-primary .mat-option.mat-selected:not(.mat-option-disabled) {
+    color: mat-color($primary);
+  }
+
+  .mat-accent .mat-option.mat-selected:not(.mat-option-disabled) {
+    color: mat-color($accent);
+  }
+
+  .mat-warn .mat-option.mat-selected:not(.mat-option-disabled) {
+    color: mat-color($warn);
+  }
 }
 
 @mixin mat-option-typography($config) {