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

This commit is contained in:
Stefan Zermatten
2021-03-01 10:18:55 +02:00
4 changed files with 7 additions and 3 deletions

View File

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

View File

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

View File

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

View File

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