Merge pull request #1213 from nextcloud/highlightActiveCard

active is highlighted
This commit is contained in:
Julius Härtl
2019-09-02 16:21:37 +02:00
committed by GitHub
3 changed files with 17 additions and 5 deletions

View File

@@ -26,19 +26,19 @@
:title="board.title" :title="board.title"
@close="closeSidebar"> @close="closeSidebar">
<AppSidebarTab name="Sharing" icon="icon-shared"> <AppSidebarTab :order="0" name="Sharing" icon="icon-shared">
<SharingTabSidebard :board="board" /> <SharingTabSidebard :board="board" />
</AppSidebarTab> </AppSidebarTab>
<AppSidebarTab name="Tags" icon="icon-tag"> <AppSidebarTab :order="1" name="Tags" icon="icon-tag">
<TagsTabSidebard :board="board" /> <TagsTabSidebard :board="board" />
</AppSidebarTab> </AppSidebarTab>
<AppSidebarTab name="Deleted items" icon="icon-delete"> <AppSidebarTab :order="2" name="Deleted items" icon="icon-delete">
<DeletedTabSidebar :board="board" /> <DeletedTabSidebar :board="board" />
</AppSidebarTab> </AppSidebarTab>
<AppSidebarTab name="Timeline" icon="icon-activity"> <AppSidebarTab :order="3" name="Timeline" icon="icon-activity">
<TimelineTabSidebard :board="board" /> <TimelineTabSidebard :board="board" />
</AppSidebarTab> </AppSidebarTab>

View File

@@ -21,7 +21,7 @@
--> -->
<template> <template>
<div :class="{'compact': compactMode}" tag="div" class="card" <div :class="{'compact': compactMode, 'current-card': currentCard}" tag="div" class="card"
@click.self="openCard"> @click.self="openCard">
<div class="card-upper"> <div class="card-upper">
<h3 v-if="showArchived">{{ card.title }}</h3> <h3 v-if="showArchived">{{ card.title }}</h3>
@@ -99,6 +99,9 @@ export default {
color: this.textColor(label.color) color: this.textColor(label.color)
} }
} }
},
currentCard() {
return this.$route.params.cardId === this.id
} }
}, },
methods: { methods: {
@@ -203,6 +206,10 @@ export default {
height: 44px; height: 44px;
} }
} }
&.current-card {
box-shadow: 0 0 6px 0 var(--color-box-shadow);
}
} }
.compact { .compact {

View File

@@ -107,6 +107,11 @@ export default new Router({
sidebar: CardSidebar sidebar: CardSidebar
}, },
props: { props: {
default: (route) => {
return {
cardId: parseInt(route.params.cardId, 10)
}
},
sidebar: (route) => { sidebar: (route) => {
return { return {
id: parseInt(route.params.cardId, 10) id: parseInt(route.params.cardId, 10)