summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-07-06 14:37:15 +0200
committerGitHub <noreply@github.com>2020-07-06 14:37:15 +0200
commit5aa6134d6ca6827313d81fe0403d1e8fa744f00c (patch)
tree49de5cd3490168ef9f91f5f5b31848c184277acd /apps
parent2d1fbabfc529e9e7e55918b50d178cf71f071743 (diff)
parent55e1d1c5dc3861de6373a8865d86a88d2ea5ba1c (diff)
downloadnextcloud-server-5aa6134d6ca6827313d81fe0403d1e8fa744f00c.tar.gz
nextcloud-server-5aa6134d6ca6827313d81fe0403d1e8fa744f00c.zip
Merge pull request #21702 from nextcloud/backport/18895/stable18
[stable18] Changes the Birthday calendar color to slightly brighter one
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/CalDAV/BirthdayService.php2
-rw-r--r--apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 31ea38fc7b7..2077ed00d49 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -165,7 +165,7 @@ class BirthdayService {
}
$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
'{DAV:}displayname' => 'Contact birthdays',
- '{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+ '{http://apple.com/ns/ical/}calendar-color' => '#E9D859',
'components' => 'VEVENT',
]);
diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index 9962cf4ca06..f6e563789e4 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -335,7 +335,7 @@ class BirthdayServiceTest extends TestCase {
->method('createCalendar')
->with('principal001', 'contact_birthdays', [
'{DAV:}displayname' => 'Contact birthdays',
- '{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+ '{http://apple.com/ns/ical/}calendar-color' => '#E9D859',
'components' => 'VEVENT',
]);
$this->service->ensureCalendarExists('principal001');