From 0a2d4cf97be4697c2bfb1e7dfea8fd2449274a4e Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Sat, 3 Dec 2022 12:16:26 +0200 Subject: [PATCH 1/6] Fixed hiding rest btn w/out events breaks statsTab --- .../ui/creature/character/characterSheetTabs/StatsTab.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue index 7f350a16..535a7fdd 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue @@ -28,7 +28,7 @@ @remove="softRemove" />
From c058f3eab48bec441b29495d33807f6e4b1ea4c5 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Sat, 3 Dec 2022 12:17:20 +0200 Subject: [PATCH 2/6] Stopped spell list cards animating on prepare --- .../components/spells/SpellListCard.vue | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/app/imports/client/ui/properties/components/spells/SpellListCard.vue b/app/imports/client/ui/properties/components/spells/SpellListCard.vue index 4474d606..d2d3134b 100644 --- a/app/imports/client/ui/properties/components/spells/SpellListCard.vue +++ b/app/imports/client/ui/properties/components/spells/SpellListCard.vue @@ -5,11 +5,21 @@ @toolbarclick="clickSpellList(model._id)" > - - -
- {{ numPrepared }}/{{ model.maxPrepared.value }} spells prepared -
- -
-
+ mdi-check + + + Date: Mon, 5 Dec 2022 10:07:32 +0200 Subject: [PATCH 3/6] Fixed type in character delete dialog --- .../client/ui/creature/character/CharacterDeleteDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue index 774d6e57..235b660a 100644 --- a/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue +++ b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue @@ -5,7 +5,7 @@

- Type "{{ name }}" to permanenetly delete the character + Type "{{ name }}" to permanently delete the character

Date: Mon, 5 Dec 2022 10:18:05 +0200 Subject: [PATCH 4/6] Re-added column layout hacks to stop chrome crashing --- app/imports/client/ui/components/ColumnLayout.vue | 8 ++++++++ .../printedCharacterSheet/CharacterSheetPrinted.vue | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/imports/client/ui/components/ColumnLayout.vue b/app/imports/client/ui/components/ColumnLayout.vue index c3bda533..16721057 100644 --- a/app/imports/client/ui/components/ColumnLayout.vue +++ b/app/imports/client/ui/components/ColumnLayout.vue @@ -39,6 +39,14 @@ export default { .column-layout>div, .column-layout>span>div { + display: table; + table-layout: fixed; + width: 100%; + backface-visibility: hidden; + -webkit-backface-visibility: hidden; + transform: translateX(0); + -webkit-transform: translateX(0); + -webkit-column-break-inside: avoid; page-break-inside: avoid; break-inside: avoid; padding: 4px; diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue index f6d2d522..721ab5e0 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue @@ -258,13 +258,6 @@ export default { .character-sheet-printed .column-layout>div { position:relative; - display: block; - width: 100%; - backface-visibility: hidden; - -webkit-backface-visibility: hidden; - -webkit-column-break-inside: avoid; - break-inside: avoid; - page-break-inside: avoid; } .character-sheet-printed .column-layout>div>* { -webkit-column-break-inside: avoid; From b92d2ecf053201de7a3d94c3cfeda77b29d80875 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 5 Dec 2022 10:27:51 +0200 Subject: [PATCH 5/6] fixes #307 Github link on new home page dead --- app/imports/client/ui/layouts/Sidebar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/imports/client/ui/layouts/Sidebar.vue b/app/imports/client/ui/layouts/Sidebar.vue index 21d34e16..1b893f37 100644 --- a/app/imports/client/ui/layouts/Sidebar.vue +++ b/app/imports/client/ui/layouts/Sidebar.vue @@ -42,6 +42,7 @@ :key="i" :to="link.to" :href="link.href" + :target="link.href ? '_blank': undefined" > {{ link.icon }} @@ -103,7 +104,7 @@ export default { { title: 'About', icon: 'mdi-sign-text', to: '/about' }, { title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs' }, { title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud' }, - { title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2' }, + { title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/' }, ]; return links.filter(link => !link.requireLogin || isLoggedIn); }, From a0744e5af3932b0019c2b9c18b2cedc78f7bd2cf Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 5 Dec 2022 11:14:22 +0200 Subject: [PATCH 6/6] Improved printing on some browsers --- .../CharacterSheetPrinted.vue | 64 ++++++++++--------- .../PrintedInventory.vue | 1 - .../printedCharacterSheet/PrintedSpells.vue | 1 - .../printedCharacterSheet/PrintedStats.vue | 23 +------ 4 files changed, 36 insertions(+), 53 deletions(-) diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue index 721ab5e0..1d47cd09 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue @@ -32,7 +32,7 @@ light >
-
+
{{ creature.name }} @@ -259,11 +259,10 @@ export default { .character-sheet-printed .column-layout>div { position:relative; } -.character-sheet-printed .column-layout>div>* { - -webkit-column-break-inside: avoid; - break-inside: avoid; +.character-sheet-printed .column-layout > div > * { page-break-inside: avoid; } + .character-sheet-printed .inactive { opacity: 1 !important; } @@ -288,38 +287,26 @@ export default { .character-sheet-printed .double-border { position: relative; padding: 11px 10px; -} - -.character-sheet-printed .double-border::before { - content: ""; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; border-image-source: url(/images/print/doubleLineImageBorder.png); border-image-slice: 110 126 fill; border-image-width: 16px; border-image-repeat: stretch; - box-sizing: content-box; - z-index: -1; } .character-sheet-printed .octagon-border { position: relative; padding: 4px 20px; -} - -.character-sheet-printed .octagon-border::before { - content: ""; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; border-image: url(/images/print/octagonBorder.png) 124 118 fill; border-image-width: 22px; - z-index: -1; +} + +.character-sheet-printed .span-all { + page-break-after: avoid; + break-after: avoid; +} +.span-all + div { + page-break-before: avoid; + break-before: avoid; } .character-sheet-printed .stats .label { @@ -348,13 +335,32 @@ export default { } } @media print { + @page { + size: auto; + margin: 8mm 8mm 8mm 8mm; + } + body { + margin: 0; + } + .character-sheet-printed .page { + width: 100%; + padding: 0 !important; + } + .character-sheet-printed .column-layout { + padding: 4px 0 !important; + } + .character-sheet-printed .title-block { + padding-left: 0 !important; + padding-right: 4px !important; + } .v-main, .v-application, .v-application--wrap, .character-sheet-printed { - display: block; + display: block !important; + background-color: white !important; } - header { - display: none !important; + html { + background-color: white !important; } - nav { + header, nav, .v-snack, .dialog-stack { display: none !important; } .v-main { diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue index 21d8d65a..324b64fa 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue @@ -1,7 +1,6 @@