diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-11-12 17:32:15 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-11-15 11:47:27 +0100 |
| commit | 521b2dd61572202519c2a2ee8b1bac71c42e0c2a (patch) | |
| tree | 4c44b26626e389a8d22a88fd705f41893c0e521b /core/css/functions.scss | |
| parent | 159d75945a57be7a391cc16a17744adfd4376473 (diff) | |
| download | nextcloud-server-521b2dd61572202519c2a2ee8b1bac71c42e0c2a.tar.gz nextcloud-server-521b2dd61572202519c2a2ee8b1bac71c42e0c2a.zip | |
Prefix icon variables with app name to avoid conflicts
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/css/functions.scss')
| -rw-r--r-- | core/css/functions.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/css/functions.scss b/core/css/functions.scss index 70c0b688fed..c34765154e4 100644 --- a/core/css/functions.scss +++ b/core/css/functions.scss @@ -66,7 +66,11 @@ */ @mixin icon-color($icon, $dir, $color, $version: 1, $core: false) { $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)); background-image: var(#{$varName}); } |