Merge pull request #2437 from nextcloud/bugfix/2356

Only remove card padding for editable cards
This commit is contained in:
Julius Härtl
2020-10-13 11:44:29 +02:00
committed by GitHub
4 changed files with 12 additions and 9 deletions

View File

@@ -144,17 +144,19 @@ export default {
} }
} }
$avatar-offset: 12px;
.avatar-list { .avatar-list {
float: right; float: right;
display: inline-flex; display: inline-flex;
padding-right: 8px; padding-right: $avatar-offset;
flex-direction: row-reverse; flex-direction: row-reverse;
.avatardiv, .avatardiv,
/deep/ .avatardiv { /deep/ .avatardiv {
width: 36px; width: 36px;
height: 36px; height: 36px;
box-sizing: content-box !important; box-sizing: content-box !important;
margin-right: -12px; margin-right: -$avatar-offset;
transition: margin-right 0.2s ease-in-out; transition: margin-right 0.2s ease-in-out;
&.icon-more { &.icon-more {

View File

@@ -121,10 +121,6 @@ export default {
} }
} }
.card:not(.card__editable) .avatars {
margin-right: 10px;
}
.fade-enter-active, .fade-leave-active { .fade-enter-active, .fade-leave-active {
transition: opacity .125s; transition: opacity .125s;
} }

View File

@@ -115,10 +115,10 @@ export default {
]), ]),
canEdit() { canEdit() {
if (this.currentBoard) { if (this.currentBoard) {
return this.$store.getters.canEdit return !this.currentBoard.archived && this.$store.getters.canEdit
} }
const board = this.$store.getters.boards.find((item) => item.id === this.card.boardId) const board = this.$store.getters.boards.find((item) => item.id === this.card.boardId)
return board ? board.permissions.PERMISSION_EDIT : false return board ? !board.archived && board.permissions.PERMISSION_EDIT : false
}, },
card() { card() {
return this.item ? this.item : this.$store.getters.cardById(this.id) return this.item ? this.item : this.$store.getters.cardById(this.id)
@@ -212,11 +212,16 @@ export default {
.card-controls { .card-controls {
display: flex; display: flex;
margin-left: $card-padding; margin-left: $card-padding;
margin-right: $card-padding;
& > div { & > div {
display: flex; display: flex;
max-height: 44px; max-height: 44px;
} }
} }
&.card__editable .card-controls {
margin-right: 0;
}
} }
.duedate { .duedate {

View File

@@ -108,7 +108,7 @@ export default {
return this.$store.getters.canEdit return this.$store.getters.canEdit
} }
const board = this.$store.getters.boards.find((item) => item.id === this.card.boardId) const board = this.$store.getters.boards.find((item) => item.id === this.card.boardId)
return board.permissions.PERMISSION_EDIT return !!board?.permissions?.PERMISSION_EDIT
}, },
isBoardAndStackChoosen() { isBoardAndStackChoosen() {
if (this.selectedBoard === '' || this.selectedStack === '') { if (this.selectedBoard === '' || this.selectedStack === '') {