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

Merge branch 'master' into feature-custom-buffs

Browse Source 
# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
This commit is contained in:
Jacob
2017-08-09 15:03:54 +01:00
parent 08735ea4f7 73d1419ee9
commit 2b188f1a8d
36 changed files with 1091 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
View File

@@ -62,9 +62,11 @@
</div>
<!--Description-->
<paper-textarea id="itemDescriptionInput" label="Description" value={{description}}>
{{> bracketSuffix}}
</paper-textarea>
<div class="description-input layout horizontal end">
<paper-textarea id="itemDescriptionInput" label="Description" value={{description}}></paper-textarea>
{{> textareaBracketSuffix}}
</div>
<!--Effects-->
{{> effectsEditList parentId=_id parentCollection="Items" charId=charId enabled=equipped name=name}}
<!--Attacks-->