Merge pull request #839 from nextcloud/fix/838

Set primary color on default calendar creation
nextcloud · Jan 28, 2020 · 43db153 · 43db153
2 parents c015170 + f4af851
commit 43db153
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/css/src/style.scss b/css/src/style.scss
@@ -533,7 +533,7 @@
 								.percentdone {
 									height: 3px;
 									border-radius: 2px 0 0 2px;
-									opacity: .75;
+									background-color: $color-primary;
 								}
 							}
 						}

diff --git a/src/app.vue b/src/app.vue
@@ -62,7 +62,11 @@ export default {
 				.then((calendars) => {
 					// No calendars? Create a new one!
 					if (calendars.length === 0) {
-						this.$store.dispatch('appendCalendar', { displayName: this.$t('tasks', 'Tasks') })
+						let color = '#0082C9'
+						if (this.$OCA.Theming) {
+							color = this.$OCA.Theming.color
+						}
+						this.$store.dispatch('appendCalendar', { displayName: this.$t('tasks', 'Tasks'), color })
 							.then(() => {
 								this.fetchTasks()
 							})