Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(select): md-optgroup not using typography styles #5193

Merged
merged 1 commit into from
Jun 20, 2017
Merged

fix(select): md-optgroup not using typography styles #5193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/lib/core/option/_optgroup-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '../theming/palette';
@import '../theming/theming';
@import '../typography/typography-utils';

@mixin mat-optgroup-theme($theme) {
$foreground: map-get($theme, foreground);
Expand All @@ -12,3 +13,9 @@
color: mat-color($foreground, hint-text);
}
}

@mixin mat-optgroup-typography($config) {
.mat-optgroup-label {
@include mat-typography-level-to-styles($config, body-2);
}
}
4 changes: 0 additions & 4 deletions src/lib/core/option/_optgroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@
@include mat-menu-item-base();
@include user-select(none);
cursor: default;

// TODO(crisbeto): should use the typography functions once #4375 is in.
font-weight: bold;
font-size: 14px;
}
}
2 changes: 2 additions & 0 deletions src/lib/core/typography/_all-typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
@import '../../tooltip/tooltip-theme';
@import '../../snack-bar/simple-snack-bar-theme';
@import '../option/option-theme';
@import '../option/optgroup-theme';


// Includes all of the typographic styles.
Expand Down Expand Up @@ -53,5 +54,6 @@
@include mat-tooltip-typography($config);
@include mat-list-typography($config);
@include mat-option-typography($config);
@include mat-optgroup-typography($config);
@include mat-simple-snack-bar-typography($config);
}