mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7767 from nextcloud/fix-theming-regression 

Fix appmenu svg double invert
This commit is contained in:
Roeland Jago Douma 2018-01-10 13:10:20 +01:00 committed by GitHub
parent 4f561e2bca 927626cbaa
commit 9c017084e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/theming/css/theming.scss
View File

@ -20,10 +20,12 @@
} }
@if (luma($color-primary) > 0.6) { @if (luma($color-primary) > 0.6) {
#appmenu img, #appmenu:not(.inverted) svg {
#appmenu image {
filter: invert(1); filter: invert(1);
} }
#appmenu.inverted svg {
filter: none;
}
.searchbox input[type="search"] { .searchbox input[type="search"] {
background: transparent url('../../../core/img/actions/search.svg') no-repeat 6px center; background: transparent url('../../../core/img/actions/search.svg') no-repeat 6px center;
} }
@ -67,10 +69,12 @@
} }
} }
} @else { } @else {
#appmenu img, #appmenu:not(.inverted) svg {
#appmenu image {
filter: none; filter: none;
} }
#appmenu.inverted svg {
filter: invert(1);
}
} }
/* Colorized svg images */ /* Colorized svg images */

10
core/templates/layout.user.php
View File

@ -41,19 +41,17 @@
</div> </div>
</a> </a>
<ul id="appmenu"> <ul id="appmenu" <?php if ($_['themingInvertMenu']) { ?>class="inverted"<?php } ?>>
<?php foreach ($_['navigation'] as $entry): ?> <?php foreach ($_['navigation'] as $entry): ?>
<li data-id="<?php p($entry['id']); ?>" class="hidden"> <li data-id="<?php p($entry['id']); ?>" class="hidden">
<a href="<?php print_unescaped($entry['href']); ?>" <a href="<?php print_unescaped($entry['href']); ?>"
<?php if ($entry['active']): ?> class="active"<?php endif; ?>> <?php if ($entry['active']): ?> class="active"<?php endif; ?>>
<?php if ($_['themingInvertMenu']) { ?>
<svg width="20" height="20" viewBox="0 0 20 20"> <svg width="20" height="20" viewBox="0 0 20 20">
<?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> <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 } ?>
<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" <div class="icon-loading-small-dark"
style="display:none;"></div> style="display:none;"></div>
</a> </a>