diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-10-29 15:45:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 15:45:45 +0100 |
| commit | c05e8acdb160599382dc3e392299785669c79560 (patch) | |
| tree | 5401f602055b345f8d5da5eab8e86bc13711042e /core | |
| parent | 4a642fc0048c03a24aa199ccc9df23d547f69aa2 (diff) | |
| parent | 34a71f57fcc6683eed969fc26e19600dfb529b53 (diff) | |
| download | nextcloud-server-c05e8acdb160599382dc3e392299785669c79560.tar.gz nextcloud-server-c05e8acdb160599382dc3e392299785669c79560.zip | |
Merge pull request #12019 from nextcloud/icons-svg-api-fixes
Move svg api endpoint
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/functions.scss | 4 | ||||
| -rw-r--r-- | core/routes.php | 6 |
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'], |