diff options
| author | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2020-05-09 21:33:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 21:33:08 +0300 |
| commit | 0b75a29dcf83b56d48189d99e9aa189b1306e6d4 (patch) | |
| tree | b652ef13f78f18b4cd9e1c84c34ca63edea883bb /src | |
| parent | 84b5b288922c1e252375e4ce87a981f7831805c0 (diff) | |
| parent | 15f6639c839fb8706400afdcd799b782ff1da27a (diff) | |
Merge pull request #1013 from nextcloud/fix/1012/calendar-color
Show calendar color in task list
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/TheCollections/Calendar.vue | 4 | ||||
| -rw-r--r-- | src/components/TheCollections/General.vue | 3 | ||||
| -rw-r--r-- | src/components/TheCollections/Week.vue | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/components/TheCollections/Calendar.vue b/src/components/TheCollections/Calendar.vue index bb037374..e6165ecc 100644 --- a/src/components/TheCollections/Calendar.vue +++ b/src/components/TheCollections/Calendar.vue @@ -49,8 +49,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. :key="task.key" :task="task" /> </TaskDragContainer> - <h2 v-show="completedCount(calendarId)" class="heading-hiddentasks icon-triangle-s reactive" @click="toggleHidden"> - {{ completedCountString }} + <h2 v-show="completedCount(calendarId)" class="heading heading--hiddentasks reactive" @click="toggleHidden"> + <span class="heading__title icon-triangle-s">{{ completedCountString }}</span> </h2> <TaskDragContainer v-if="showHidden" :calendar-id="calendarId" diff --git a/src/components/TheCollections/General.vue b/src/components/TheCollections/General.vue index 59932d94..00e39d9a 100644 --- a/src/components/TheCollections/General.vue +++ b/src/components/TheCollections/General.vue @@ -42,7 +42,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. :rel="calendar.id" class="grouped-tasks ui-droppable"> <h2 class="heading"> - {{ calendar.displayName }} + <span class="heading__icon-bullet" :style="{'background-color': calendar.color }" /> + <span class="heading__title">{{ calendar.displayName }}</span> </h2> <TaskDragContainer :calendar-id="calendar.id" diff --git a/src/components/TheCollections/Week.vue b/src/components/TheCollections/Week.vue index 5d14fa0e..1faaf0cb 100644 --- a/src/components/TheCollections/Week.vue +++ b/src/components/TheCollections/Week.vue @@ -42,7 +42,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. :day="day.diff" class="grouped-tasks ui-droppable"> <h2 class="heading"> - {{ dayString(day.diff) }} + <span class="heading__title">{{ dayString(day.diff) }}</span> </h2> <TaskDragContainer :collection-id="'week-' + day.diff" |