skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(select,autocomplete): mat-option theme not being applied correctly when nested inside a selector (#10889)

Browse Source 
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);
}
```
This commit is contained in:
Kristiyan Kostadinov
2018-04-17 22:53:50 -04:00
committed by mmalerba
parent d2b183e4d5
commit 1a60a7a690
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/core/option/_option-theme.scss
+12 -12
View File
@@ -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) {