diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-25 00:05:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 00:05:13 +0200 |
| commit | f5e4fcadd99a734939f4a0ff09325c6171a6792c (patch) | |
| tree | e42e52b5b6dce2b68ff6bd2dcea58aa3f7de1918 /apps | |
| parent | 71028fde6b201e35fa7efb224896c8bf3050a856 (diff) | |
| parent | dd5f1803dbe27f0aebe67e6243ddc2af71419c9a (diff) | |
| download | nextcloud-server-f5e4fcadd99a734939f4a0ff09325c6171a6792c.tar.gz nextcloud-server-f5e4fcadd99a734939f4a0ff09325c6171a6792c.zip | |
Merge pull request #10378 from nextcloud/bugfix/noid/fix-icon-name-14
Fix icon file names
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Calendar.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Event.php | 2 | ||||
| -rw-r--r-- | apps/files_external/js/settings.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php index 45bc3d71c4a..961e4b9764f 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php @@ -93,7 +93,7 @@ class Calendar extends Base { if ($this->activityManager->getRequirePNG()) { $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'))); } if ($event->getSubject() === self::SUBJECT_ADD) { diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php index f13cb0c266b..378a18397ec 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php @@ -87,7 +87,7 @@ class Event extends Base { if ($this->activityManager->getRequirePNG()) { $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'))); } if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') { diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 983348397d1..38a77b59a14 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -186,7 +186,7 @@ function addSelect2 ($elements, userListLimit) { .attr('data-name', element.name) .attr('data-displayname', element.displayname); if (element.type === 'group') { - var url = OC.imagePath('core','places/contacts-dark'); // TODO better group icon + var url = OC.imagePath('core','actions/group'); $div.html('<img width="32" height="32" src="'+url+'">'); } return $result.get(0).outerHTML; |