Skip to content

Commit 9003a1b

Browse files
committed
fixup! fix(material/core): fix opacity in elevation mixin
1 parent d39d8fd commit 9003a1b

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/material/core/style/_elevation.scss

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ $prefix: 'mat-elevation-z';
4848
$ambient-z-value: map.get(mdc-elevation.$ambient-map, $zValue);
4949

5050
$color-opacity: if($opacity != null, $opacity, 1);
51-
$umbra-color: rgba($color, mdc-elevation.$umbra-opacity * $color-opacity);
52-
$penumbra-color: rgba($color, mdc-elevation.$penumbra-opacity * $color-opacity);
53-
$ambient-color: rgba($color, mdc-elevation.$ambient-opacity * $color-opacity);
51+
$umbra-color: compute-color-opacity($color, mdc-elevation.$umbra-opacity * $color-opacity);
52+
$penumbra-color:
53+
compute-color-opacity($color, mdc-elevation.$penumbra-opacity * $color-opacity);
54+
$ambient-color: compute-color-opacity($color, mdc-elevation.$ambient-opacity * $color-opacity);
5455

5556
$box-shadow: (
5657
#{'#{$umbra-z-value} #{$umbra-color}'},
5758
#{'#{$penumbra-z-value} #{$penumbra-color}'},
5859
#{$ambient-z-value} $ambient-color
5960
);
60-
6161
@include mdc-elevation.shadow($box-shadow);
6262
}
6363
}
@@ -94,3 +94,12 @@ $prefix: 'mat-elevation-z';
9494
$easing: $transition-timing-function) {
9595
transition: private-transition-property-value($duration, $easing);
9696
}
97+
98+
@function compute-color-opacity($color, $opacity) {
99+
@if meta.type-of($color) == color and $opacity != null {
100+
@return rgba($color, $opacity);
101+
}
102+
@else {
103+
@return $color;
104+
}
105+
}

0 commit comments

Comments
 (0)