jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-2' into version-2-dev

Browse Source
This commit is contained in:
Stefan Zermatten
2021-03-01 10:18:55 +02:00
parent cd45ae1442 e381b3b24d
commit e617ef9b75
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/imports/ui/creature/character/CharacterSheetFab.vue
View File

@@ -67,7 +67,7 @@
return this.speedDialsByTab[tabs[this.tabNumber]]; return this.speedDialsByTab[tabs[this.tabNumber]];
}, },
speedDialsByTab() { return { speedDialsByTab() { return {
'stats': ['attribute', 'skill'], 'stats': ['attribute', 'skill', 'action', 'attack'],
'features': ['feature'], 'features': ['feature'],
'inventory': ['item', 'container'], 'inventory': ['item', 'container'],
'spells': ['spellList', 'spell'], 'spells': ['spellList', 'spell'],

1
app/imports/ui/creature/character/CharacterSheetToolbar.vue
View File

@@ -108,6 +108,7 @@
Tree Tree
</v-tab> </v-tab>
</v-tabs> </v-tabs>
<v-spacer />
<character-sheet-fab <character-sheet-fab
class="character-sheet-fab" class="character-sheet-fab"
:edit-permission="editPermission" :edit-permission="editPermission"

5
app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
View File

@@ -1,5 +1,8 @@
<template lang="html"> <template lang="html">
<selectable-property-dialog :value="forcedType || type"> <selectable-property-dialog
:value="forcedType || type"
@input="e => type = e"
>
<creature-property-insert-form <creature-property-insert-form
:type="forcedType || type" :type="forcedType || type"
:property-name="getPropertyName(forcedType || type)" :property-name="getPropertyName(forcedType || type)"

2
app/imports/ui/properties/shared/SelectablePropertyDialog.vue
View File

@@ -8,7 +8,7 @@
<v-toolbar-title slot="toolbar"> <v-toolbar-title slot="toolbar">
Add Library Content Add Library Content
</v-toolbar-title> </v-toolbar-title>
<property-selector @select="property => $emit('input', property)" /> <property-selector @select="type => $emit('input', type)" />
</dialog-base> </dialog-base>
<div <div
v-show="value" v-show="value"