diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-09 11:22:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 11:22:54 +0100 |
| commit | 25ba9cbe71a597e6cab8e1cdf9df85808e0babfa (patch) | |
| tree | 3fb7ad243df05168c2148ac20934705551d74ac1 /core | |
| parent | 2f9d59535ddad309863c5202b2c7dccf3cc8bd53 (diff) | |
| parent | 1d47410021fcc3ce9968a84453b809a1d8744db9 (diff) | |
| download | nextcloud-server-25ba9cbe71a597e6cab8e1cdf9df85808e0babfa.tar.gz nextcloud-server-25ba9cbe71a597e6cab8e1cdf9df85808e0babfa.zip | |
Merge pull request #7684 from nextcloud/backport-ie-fix-invert
[stable12] Fix inverted app icons on IE11
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.user.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 50ed08761ae..d54a6fe114f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -66,8 +66,14 @@ <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" <?php if ($entry['active']): ?> class="active"<?php endif; ?>> - <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" - class="app-icon"/> + <?php if ($_['themingInvertMenu']) { ?> + <svg width="20" height="20" viewBox="0 0 20 20"> + <defs><filter id="invertMenuMain-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs> + <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMain-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" /></svg> + <?php } else { ?> + <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" + class="app-icon" alt="<?php p($entry['name']); ?>" /> + <?php } ?> <div class="icon-loading-small-dark" style="display:none;"></div> </a> @@ -94,8 +100,8 @@ <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <svg width="16" height="16" viewBox="0 0 16 16"> - <defs><filter id="invert-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> - <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> + <defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> + <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> </svg> <div class="icon-loading-small-dark" style="display:none;"></div> <span><?php p($entry['name']); ?></span> |