diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-01-10 11:11:17 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-01-12 16:35:44 +0300 |
| commit | 394f1d89d3dd41fe931685f7143bb14b83da403f (patch) | |
| tree | 7bee01480b1d76da7b5147bdc96230e6e0713f66 /core | |
| parent | 0ce9a66920c729533071aaf7f6daa86931f663b9 (diff) | |
Fix appmenu svg double invert
This fixes a regression caused by 9b668d0, where the css filters to
preview color inversion of the app menu was applied by default. This
commit makes the css filters sensitive on what the current state of the
app menu is.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.user.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d54a6fe114f..2a413a4d958 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -60,20 +60,18 @@ <div class="icon-caret"></div> </a> - <ul id="appmenu"> + <ul id="appmenu" <?php if ($_['themingInvertMenu']) { ?>class="inverted"<?php } ?>> <?php foreach ($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>" class="hidden"> <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" <?php if ($entry['active']): ?> class="active"<?php endif; ?>> - <?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 } ?> + <?php if ($_['themingInvertMenu']) { ?> + <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> + <?php } ?> + <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" /> + </svg> <div class="icon-loading-small-dark" style="display:none;"></div> </a> |