summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-07-06 14:37:32 +0200
committerGitHub <noreply@github.com>2020-07-06 14:37:32 +0200
commit341757945fb9d0878e2bbefc3db967570e712c57 (patch)
tree2d7b8813ffb9ab41fe2e222b2150dc0305e47754
parentb6aac70529f2aff75a7195d61934b5a45dc22a5e (diff)
parent2b72b5cea5ba7d9376d158ffafc91c98131505b1 (diff)
downloadnextcloud-server-341757945fb9d0878e2bbefc3db967570e712c57.tar.gz
nextcloud-server-341757945fb9d0878e2bbefc3db967570e712c57.zip
Merge pull request #21703 from nextcloud/backport/18895/stable19
[stable19] Changes the Birthday calendar color to slightly brighter one
-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 b492d4219c7..e64e886a01c 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 e6ba0f5ef02..8885637aee6 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -343,7 +343,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');