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

Merge pull request #937 from nextcloud/fix_app_search 

SVG defintions always take the first one
This commit is contained in:
Roeland Jago Douma 2016-08-18 19:21:07 +02:00 committed by GitHub
parent 6d7c5e2265 59da5972f6
commit 7f96e4e675
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings/js/apps.js
View File

@ -238,7 +238,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
if (appfromstore) { if (appfromstore) {
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon" /></svg>'; img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon" /></svg>';
} else { } else {
img += '<defs><filter id="invertIcon"><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>';
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>'; img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
} }
return img; return img;

3
settings/templates/apps.php
View File

@ -180,6 +180,9 @@ script(
</div> </div>
</div> </div>
<div id="app-content"> <div id="app-content">
<svg height="0">
<defs><filter id="invertIcon"><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>
</svg>
<div id="apps-list" class="icon-loading"></div> <div id="apps-list" class="icon-loading"></div>
<div id="apps-list-empty" class="hidden emptycontent emptycontent-search"> <div id="apps-list-empty" class="hidden emptycontent emptycontent-search">
<div class="icon-search"></div> <div class="icon-search"></div>