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

feat(test): Add overline tests. #7242

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(test): Add overline tests. #7242

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
93 changes: 90 additions & 3 deletions packages/mdc-list/_evolution-mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

@include list-primary-text-ink-color(text-primary-on-background, $query);
@include list-secondary-text-ink-color(text-secondary-on-background, $query);
@include list-overline-text-ink-color(text-hint-on-background, $query);
@include list-icon-fill-color(transparent, $query);
@include list-icon-ink-color(text-icon-on-background, $query);
@include list-meta-text-ink-color(text-hint-on-background, $query);
Expand Down Expand Up @@ -199,26 +200,41 @@
line-height: 20px;
}
}

.mdc-list-item--with-overline & {
@include feature-targeting.targets($feat-structure) {
white-space: nowrap;
line-height: auto;
}
}
}

.mdc-list-item__overline-text {
// TODO (b/168043604): fully style overline.
@include typography.typography(overline, $query);
@include typography.overflow-ellipsis($query);

.mdc-list-item--with-two-lines &,
.mdc-list-item--with-three-lines & {
.mdc-list-item--with-two-lines & {
@include typography.text-baseline(
$top: 24px,
$bottom: 20px,
$query: $query
);
}

.mdc-list-item--with-three-lines & {
@include typography.text-baseline(
$top: 28px,
$bottom: 20px,
$query: $query
);
}
}

.mdc-list-item--with-leading-avatar {
@include item-start-spacing(16px, $query: $query);
@include item-start-size(40px, $query: $query);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand All @@ -244,6 +260,7 @@
$query: $query
);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand All @@ -259,6 +276,7 @@
@include item-start-spacing(16px, $query: $query);
@include item-start-size(40px, $query: $query);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand All @@ -274,6 +292,7 @@
@include item-start-spacing(16px, $query: $query);
@include item-start-size(56px, $query: $query);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-taller-density(
variables.$one-line-item-density-scale,
Expand All @@ -294,6 +313,7 @@
@include item-start-spacing($leading: 0, $trailing: 16px, $query: $query);
@include item-start-size($width: 100px, $height: 56px, $query: $query);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-taller-density(
variables.$one-line-item-density-scale,
Expand All @@ -318,6 +338,7 @@
$query: $query
);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand All @@ -342,6 +363,7 @@
$query: $query
);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand All @@ -362,6 +384,7 @@
$query: $query
);
@include _two-line-item-primary-baseline(32px, 20px, $query: $query);
@include _two-line-item-overline-baseline(28px, 20px, $query: $query);
@include _two-line-item-meta-baseline($top: 32px, $query: $query);
@include _one-line-item-tall-density(
variables.$one-line-item-density-scale,
Expand Down Expand Up @@ -428,6 +451,11 @@
);
}

.mdc-list-item--with-overline {
@include _two-line-item-primary-baseline(20px, 0px, $query: $query);
@include _three-line-item-primary-baseline(20px, 0px, $query: $query);
}

// This must be specified last to ensure that RTL padding takes priority over
// LTR padding in the cascade.
.mdc-list-item {
Expand Down Expand Up @@ -787,6 +815,16 @@
}
}

@mixin list-overline-text-ink-color($color, $query: feature-targeting.all()) {
$feat-color: feature-targeting.create-target($query, color);

.mdc-list-item__overline-text {
@include feature-targeting.targets($feat-color) {
@include theme.property(color, $color);
}
}
}

@mixin list-meta-text-ink-color($color, $query: feature-targeting.all()) {
$feat-color: feature-targeting.create-target($query, color);

Expand Down Expand Up @@ -847,6 +885,7 @@
.mdc-list-item--disabled {
@include list-primary-text-ink-color($color, $query);
@include list-secondary-text-ink-color($color, $query);
@include list-overline-text-ink-color($color, $query);
@include _item-icon-ink-color($color, $query: $query);
@include _item-meta-text-ink-color($color, $query);
}
Expand Down Expand Up @@ -1245,6 +1284,54 @@
}
}

@mixin _three-line-item-primary-baseline(
$top,
$bottom,
$query: feature-targeting.all()
) {
&.mdc-list-item--with-three-lines {
.mdc-list-item__primary-text {
@include typography.text-baseline(
$top: $top,
$bottom: $bottom,
$query: $query
);
}
}
}

@mixin _two-line-item-overline-baseline(
$top,
$bottom,
$query: feature-targeting.all()
) {
&.mdc-list-item--with-two-lines {
.mdc-list-item__overline-text {
@include typography.text-baseline(
$top: $top,
$bottom: $bottom,
$query: $query
);
}
}
}

@mixin _three-line-item-overline-baseline(
$top,
$bottom,
$query: feature-targeting.all()
) {
&.mdc-list-item--with-three-lines {
.mdc-list-item__overline-text {
@include typography.text-baseline(
$top: $top,
$bottom: $bottom,
$query: $query
);
}
}
}

@mixin _two-line-item-end-baseline($top, $query: feature-targeting.all()) {
&.mdc-list-item--with-two-lines {
.mdc-list-item__end {
Expand Down