Skip to content

Commit

Permalink
Merge pull request #5292 from nextcloud/bugfix/noid/compact-due
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl committed Nov 16, 2023
2 parents 23a4e24 + 72da4c8 commit 2242a7d
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/components/cards/CardItem.vue
Expand Up @@ -53,6 +53,7 @@
@keyup.stop>{{ card.title }}</span>
</h3>

<DueDate v-if="compactMode && card.duedate" :card="card" />
<CardMenu v-if="showMenuAtTitle" :card="card" class="right card-menu" />
</div>

Expand Down Expand Up @@ -90,10 +91,11 @@ import labelStyle from '../../mixins/labelStyle.js'
import AttachmentDragAndDrop from '../AttachmentDragAndDrop.vue'
import CardMenu from './CardMenu.vue'
import CardCover from './CardCover.vue'
import DueDate from './badges/DueDate.vue'
export default {
name: 'CardItem',
components: { CardBadges, AttachmentDragAndDrop, CardMenu, CardCover },
components: { CardBadges, AttachmentDragAndDrop, CardMenu, CardCover, DueDate },
directives: {
ClickOutside,
},
Expand Down Expand Up @@ -140,7 +142,7 @@ export default {
return board ? !board.archived && board.permissions.PERMISSION_EDIT : false
},
inlineEditingBlocked() {
return this.compactMode || this.isArchived || this.showArchived || !this.canEdit || this.standalone
return this.isArchived || this.showArchived || !this.canEdit || this.standalone
},
card() {
return this.item ? this.item : this.$store.getters.cardById(this.id)
Expand Down Expand Up @@ -350,6 +352,10 @@ export default {
.duedate {
margin-right: 0;
display: flex;
height: 32px;
width: 32px;
margin-top: 6px;
}
&.has-labels {
padding-bottom: $card-padding;
Expand All @@ -365,6 +371,9 @@ export default {
font-size: 0;
color: transparent;
}
.card-menu {
align-self: start !important;
}
}
@media (prefers-color-scheme: dark) {
Expand Down

0 comments on commit 2242a7d

Please sign in to comment.