diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-08-18 20:21:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 20:21:28 +0300 |
| commit | df5a1e2a30e9f2bac00522b3e99482d4c9544f22 (patch) | |
| tree | 17c6382eda95576efca0febf1a90a9e9fa595cd3 | |
| parent | 0f926e03bdf7738d9db733f296836d3311dbdd3e (diff) | |
| parent | c07090ef6e6facfe0ef2d8b16b824eec6212bc00 (diff) | |
Merge pull request #939 from nextcloud/stable10-backport-937v10.0RC1
[stable10] SVG defintions always take the first one
| -rw-r--r-- | settings/js/apps.js | 1 | ||||
| -rw-r--r-- | settings/templates/apps.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index ac259dd7989..80949e1dd74 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -238,7 +238,6 @@ OC.Settings.Apps = OC.Settings.Apps || { if (appfromstore) { img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>'; } 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 + '" class="app-icon"></image></svg>'; } return img; diff --git a/settings/templates/apps.php b/settings/templates/apps.php index be8a911c1aa..ea62acd9945 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -180,6 +180,9 @@ script( </div> </div> <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-empty" class="hidden emptycontent emptycontent-search"> <div class="icon-search"></div> |