Skip to content

Commit d87a66c

Browse files
authored
Merge pull request #8166 from IgniteUI/simeonoff/fix-8136
fix(theming): retrofit bug fixes from newer versions
2 parents 52aa232 + 00547a1 commit d87a66c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

projects/igniteui-angular/src/lib/core/styles/base/elevations/_index.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@
110110
/// @param {Color} $l3-color - The ambient color.
111111
/// @returns {String} - A string to be used as box-shadow value.
112112
@function _elevation($elevation, $l1-color, $l2-color, $l3-color) {
113-
@return unquote(
114-
'#{map-get(_l1-shadows($l1-color), $elevation)},
115-
#{map-get(_l2-shadows($l2-color), $elevation)},
116-
#{map-get(_l3-shadows($l3-color), $elevation)}'
113+
@return unquote(#{
114+
map-get(_l1-shadows($l1-color), $elevation),
115+
map-get(_l2-shadows($l2-color), $elevation),
116+
map-get(_l3-shadows($l3-color), $elevation)}
117117
);
118118
}
119119

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@
104104
/// @param {number|string} $variant [500] - The target color shade from the color palette.
105105
/// @returns {Color} White if no palette, color, and variant matches found.
106106
@function igx-color($palette, $color, $variant: 500) {
107-
@if map-exists($palette) and map-key-exists($palette, $color) and map-key-exists($color, $variant) {
107+
@if type-of($palette) == 'map' and map-has-key($palette, $color) {
108108
@return map-get(map-get($palette, $color), $variant);
109109
}
110+
110111
@return #fff;
111112
}
112113

0 commit comments

Comments
 (0)