Skip to content

Commit

Permalink
style(checkbox,chips,tabs): remove hardcoded hues (#4101)
Browse files Browse the repository at this point in the history
* Remove hardcoded hues from checkbox/pseduo checkbox

* Remove hardcoded hues from chips

* Remove hardcoded hues from tabs ink/focus
  • Loading branch information
willshowell authored and andrewseguin committed May 2, 2017
1 parent 3acf2a2 commit 4021276
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/lib/checkbox/_checkbox-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@

.mat-checkbox-indeterminate, .mat-checkbox-checked {
&.mat-primary .mat-checkbox-background {
background-color: mat-color($primary, 500);
background-color: mat-color($primary);
}

&.mat-accent .mat-checkbox-background {
background-color: mat-color($accent, 500);
background-color: mat-color($accent);
}

&.mat-warn .mat-checkbox-background {
background-color: mat-color($warn, 500);
background-color: mat-color($warn);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/lib/chips/_chips-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
color: $selected-foreground;

&.mat-primary {
background-color: mat-color($primary, 500);
color: mat-contrast($primary, 500);
background-color: mat-color($primary);
color: mat-color($primary, default-contrast);
}

&.mat-accent {
background-color: mat-color($accent, 500);
color: mat-contrast($accent, 500);
background-color: mat-color($accent);
color: mat-color($accent, default-contrast);
}

&.mat-warn {
background-color: mat-color($warn, 500);
color: mat-contrast($warn, 500);
background-color: mat-color($warn);
color: mat-color($warn, default-contrast);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@mixin _mat-pseudo-checkbox-inner-content-theme($theme, $pallete-name) {
$pallete: map-get($theme, $pallete-name);
$color: mat-color($pallete, 500);
$color: mat-color($pallete);

.mat-pseudo-checkbox-checked.mat-#{$pallete-name},
.mat-pseudo-checkbox-indeterminate.mat-#{$pallete-name},
Expand Down
4 changes: 2 additions & 2 deletions src/lib/tabs/_tabs-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
}

.mat-tab-label:focus {
background-color: mat-color($primary, 100, 0.3);
background-color: mat-color($primary, lighter, 0.3);
}

.mat-ink-bar {
background-color: mat-color($primary, 500);
background-color: mat-color($primary);
}

.mat-tab-label, .mat-tab-link {
Expand Down

0 comments on commit 4021276

Please sign in to comment.