Skip to content
Snippets Groups Projects
Unverified Commit 7baa67ca authored by Morris Jobke's avatar Morris Jobke Committed by GitHub
Browse files

Merge pull request #12421 from nextcloud/bugfix/noid/icons-cacher-app-prefix

Prefix icon variables with app name to avoid conflicts
parents 159d7594 521b2dd6
No related branches found
No related tags found
No related merge requests found
...@@ -66,7 +66,11 @@ ...@@ -66,7 +66,11 @@
*/ */
@mixin icon-color($icon, $dir, $color, $version: 1, $core: false) { @mixin icon-color($icon, $dir, $color, $version: 1, $core: false) {
$color: remove-hash-from-color($color); $color: remove-hash-from-color($color);
$varName: "--icon-#{$icon}-#{$color}"; /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */
$varName: "--icon-#{$dir}-#{$icon}-#{$color}";
@if $core {
$varName: "--icon-#{$icon}-#{$color}";
}
#{$varName}: url(icon-color-path($icon, $dir, $color, $version, $core)); #{$varName}: url(icon-color-path($icon, $dir, $color, $version, $core));
background-image: var(#{$varName}); background-image: var(#{$varName});
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment