summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-10-24 14:47:08 +0200
committerJulius Härtl <jus@bitgrid.net>2018-10-29 11:45:13 +0100
commit5c74423902abc61ac5dc72c09d6318653eafe2b7 (patch)
tree35c5ff4162f421fb7fdc5becc4832a5eedb3d07b
parent0c89dd2197a13dab06d31675ed98cd3a76aaf44d (diff)
downloadnextcloud-server-5c74423902abc61ac5dc72c09d6318653eafe2b7.tar.gz
nextcloud-server-5c74423902abc61ac5dc72c09d6318653eafe2b7.zip
Move svg api endpoint
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--core/css/functions.scss4
-rw-r--r--core/routes.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/core/css/functions.scss b/core/css/functions.scss
index 5007c3bbe79..70c0b688fed 100644
--- a/core/css/functions.scss
+++ b/core/css/functions.scss
@@ -47,9 +47,9 @@
@function icon-color-path($icon, $dir, $color, $version: 1, $core: false) {
$color: remove-hash-from-color($color);
@if $core {
- @return '#{$webroot}/svg/core/#{$dir}/#{$icon}/#{$color}?v=#{$version}';
+ @return '#{$webroot}/svg/core/#{$dir}/#{$icon}?color=#{$color}&v=#{$version}';
} @else {
- @return '#{$webroot}/svg/#{$dir}/#{$icon}/#{$color}?v=#{$version}';
+ @return '#{$webroot}/svg/#{$dir}/#{$icon}?color=#{$color}&v=#{$version}';
}
}
diff --git a/core/routes.php b/core/routes.php
index f3884a765a2..f5e6d8e7d21 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -61,9 +61,9 @@ $application->registerRoutes($this, [
['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
- ['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}/{color}', 'verb' => 'GET'],
- ['name' => 'Svg#getSvgFromSettings', 'url' => '/svg/settings/{folder}/{fileName}/{color}', 'verb' => 'GET'],
- ['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}/{color}', 'verb' => 'GET'],
+ ['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
+ ['name' => 'Svg#getSvgFromSettings', 'url' => '/svg/settings/{folder}/{fileName}', 'verb' => 'GET'],
+ ['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],