From 4df7a9caf934ac1363a173e43efcb3c1a11623fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 13 Oct 2020 09:38:30 +0200 Subject: [PATCH 1/5] Do not open the dialog automatically upon card creation, only upon click MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/board/Stack.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue index 8d3fb9009..c04eba3cb 100644 --- a/src/components/board/Stack.vue +++ b/src/components/board/Stack.vue @@ -162,6 +162,7 @@ export default { ]), ...mapState({ showArchived: state => state.showArchived, + cardDetailsInModal: state => state.cardDetailsInModal, }), cardsByStack() { return this.$store.getters.cardsByStack(this.stack.id).filter((card) => { @@ -248,7 +249,9 @@ export default { this.$refs.newCardInput.focus() this.animate = false }) - this.$router.push({ name: 'card', params: { cardId: newCard.id } }) + if (!this.cardDetailsInModal) { + this.$router.push({ name: 'card', params: { cardId: newCard.id } }) + } } catch (e) { showError('Could not create card: ' + e.response.data.message) } finally { From 1f54ecca5b7b2f4d25946232d0b4eac22a9a1be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 13 Oct 2020 09:47:35 +0200 Subject: [PATCH 2/5] Do not trigger card open when updating the title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/cards/CardItem.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue index a1ff4947d..6e5bfbf5b 100644 --- a/src/components/cards/CardItem.vue +++ b/src/components/cards/CardItem.vue @@ -29,7 +29,7 @@
+ @click.self="openCard">

{{ card.title }} @@ -61,7 +61,7 @@ class="labels" @click="openCard">
  • - {{ label.title }} + {{ label.title }}
    • From 4e996402c728a386159d4945edac7b8aafdb5e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 13 Oct 2020 09:57:22 +0200 Subject: [PATCH 3/5] Give modal a bit more padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/App.vue | 15 ++++++++------- src/components/card/CardSidebar.vue | 8 +++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/App.vue b/src/App.vue index 795ef225b..ff768c9be 100644 --- a/src/App.vue +++ b/src/App.vue @@ -131,13 +131,6 @@ export default { } } } - - - + + diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue index 26ba98574..bec93b6e6 100644 --- a/src/components/card/CardSidebar.vue +++ b/src/components/card/CardSidebar.vue @@ -571,14 +571,16 @@ export default { // FIXME: Obivously we should at some point not randomly reuse the sidebar component // since this is not oficially supported .modal__card .app-sidebar { + $modal-padding: 14px; border: 0; - min-width: 100%; + min-width: calc(100% - #{$modal-padding*2}); position: relative; top: 0; left: 0; right: 0; - max-width: 100%; - max-height: 100%; + max-width: calc(100% - #{$modal-padding*2}); + padding: 14px; + max-height: calc(100% - #{$modal-padding*2}); &::v-deep { .app-sidebar-header { position: sticky; From 1fa33f76dc9f3458a1b085a50e7a001be5c1869a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 13 Oct 2020 09:57:48 +0200 Subject: [PATCH 4/5] Avoid issues with clicking in compact mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/cards/CardItem.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue index 6e5bfbf5b..7e9a3aea6 100644 --- a/src/components/cards/CardItem.vue +++ b/src/components/cards/CardItem.vue @@ -29,9 +29,9 @@
    + @click="openCard">
    -

    +

    {{ card.title }}

    @@ -41,6 +41,7 @@
    + @click.stop="openCard">
  • {{ label.title }}
    • From 1315fb6d02fa9120b6868fd0221b1f67058478e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 13 Oct 2020 09:58:04 +0200 Subject: [PATCH 5/5] Always have pointer for cards by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/cards/CardItem.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue index 7e9a3aea6..869769276 100644 --- a/src/components/cards/CardItem.vue +++ b/src/components/cards/CardItem.vue @@ -172,6 +172,10 @@ export default { background-color: var(--color-main-background); margin-bottom: $card-spacing; + &::v-deep * { + cursor: pointer; + } + body.dark &, body.theme--dark & { border: 2px solid var(--color-border); }