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(list): Respect BEM when outputting the base stylesheet. #1799

Merged
merged 2 commits into from
Dec 20, 2017
Merged

fix(list): Respect BEM when outputting the base stylesheet. #1799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f8b513
fix(list): Respect BEM when outputting the base stylesheet.
simono Dec 18, 2017
6435476
Merge branch 'master' into fix/list-bem-no-nesting
lynnmercier Dec 20, 2017
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
26 changes: 15 additions & 11 deletions packages/mdc-list/mdc-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,22 @@
@import "./mixins";
@import "./variables";

// TODO(acdvorak): Find a way to remove parent .mdc-list and .mdc-list-group selectors; they violate BEM.
.mdc-list,
.mdc-list-group {
@include mdc-list-divider-color($mdc-list-divider-color-light);

@include mdc-theme-dark {
@include mdc-list-divider-color($mdc-list-divider-color-dark);
}
}

@at-root {
@include mdc-list-divider-color($mdc-list-divider-color-light);
}

// postcss-bem-linter: define list

.mdc-list {
@include mdc-typography(subheading2);

// TODO(acdvorak): Find a way to remove parent .mdc-list selector; it violates BEM.
@include mdc-list-item-primary-text-ink-color(text-primary-on-background);
@include mdc-list-item-secondary-text-ink-color(text-secondary-on-background);
@include mdc-list-item-graphic-fill-color(transparent);
@include mdc-list-item-graphic-ink-color(text-icon-on-background);
@include mdc-list-item-meta-ink-color(text-hint-on-background);

@include mdc-theme-dark {
@include mdc-list-item-primary-text-ink-color(text-primary-on-dark);
Expand All @@ -59,6 +54,13 @@
list-style-type: none;
}

@at-root {
@include mdc-list-item-secondary-text-ink-color(text-secondary-on-background);
@include mdc-list-item-graphic-fill-color(transparent);
@include mdc-list-item-graphic-ink-color(text-icon-on-background);
@include mdc-list-item-meta-ink-color(text-hint-on-background);
}

.mdc-list--dense {
padding-top: 4px;
padding-bottom: 4px;
Expand Down Expand Up @@ -215,8 +217,6 @@ a.mdc-list-item {
// postcss-bem-linter: define list-group

.mdc-list-group {
@include mdc-list-group-subheader-ink-color(text-primary-on-background);

@include mdc-theme-dark {
@include mdc-list-group-subheader-ink-color(text-primary-on-dark);
}
Expand All @@ -238,4 +238,8 @@ a.mdc-list-item {
}
}

@at-root {
@include mdc-list-group-subheader-ink-color(text-primary-on-background);
}

// postcss-bem-linter: end