Skip to content

Commit

Permalink
Merge branch 'master' into fix-toolbar-ie-11-bug-master
Browse files Browse the repository at this point in the history
  • Loading branch information
kdinev authored Dec 11, 2018
2 parents 8e10081 + 3ec517b commit 1e24d6c
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -489,11 +489,11 @@
@each $fn, $args in $ctx {
@if function-exists($fn) {
@if $result == null and ($fn == 'igx-color' or $fn == 'igx-contrast-color') {
$result: call(get-function($fn), $extra, $args...);
$result: call($fn, $extra, $args...);
} @else if $result != null {
$result: call(get-function($fn), $result, $args...)
$result: call($fn, $result, $args...)
} @else {
$result: call(get-function($fn), $args...)
$result: call($fn, $args...)
}
}
}
Expand Down

0 comments on commit 1e24d6c

Please sign in to comment.