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

Merge branch 'fixbug-107' into misc-enhancements

Browse Source 
# Conflicts:
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
This commit is contained in:
Jacob
2017-07-18 22:05:31 +01:00
parent 5ca81056f9 073094f6dd
commit 11adf9da04
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rpg-docs/client/views/character/features/featureDialog/featureDialog.html
View File

@@ -68,8 +68,11 @@
{{/if}}
</div>
<!--description-->
<paper-textarea label="Description" id="featureDescriptionInput" value={{description}}></paper-textarea>
<!--Description-->
<div class=description-input>
<paper-textarea id="featureDescriptionInput" label="Description" value={{description}}></paper-textarea>
{{> textareaBracketSuffix}}
</div>
{{> effectsEditList parentId=_id parentCollection="Features" charId=charId name=name enabled=enabled}}
{{> proficiencyEditList parentId=_id parentCollection="Features" charId=charId enabled=enabled}}

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

@@ -61,12 +61,10 @@
</div>
<!--Description-->
<paper-textarea id="itemDescriptionInput" label="Description" value={{description}}>
<div suffix>
<paper-tooltip position="left" animation-delay="0">This field accepts formulae in {curly brackets}</paper-tooltip>
<iron-icon icon="dicecloud:code-braces"></iron-icon>
</div>
</paper-textarea>
<div class=description-input>
<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-->

8
rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
View File

@@ -111,8 +111,10 @@
</paper-checkbox>
</div>
<!--Description-->
<paper-textarea id="descriptionInput" label="Description" value="{{description}}">
</paper-textarea>
<div class=description-input>
<paper-textarea id="descriptionInput" label="Description" value={{description}}></paper-textarea>
{{> textareaBracketSuffix}}
</div>
{{> attackEditList parentId=_id parentCollection="Spells" charId=charId enabled=true name=name isSpell=true}}
</template>

10
rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.css Normal file
View File

@@ -0,0 +1,10 @@
.textarea-bracket-suffix {
float: right;
position: absolute;
right: 6px;
bottom: 12px;
}
.description-input {
position: relative;
}

7
rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html
View File

@@ -11,3 +11,10 @@
<iron-icon icon="dicecloud:code-braces"></iron-icon>
</div>
</template>
<template name="textareaBracketSuffix">
<div class="textarea-bracket-suffix">
<paper-tooltip position="left" animation-delay="0">This field accepts formulae in {curly brackets}</paper-tooltip>
<iron-icon icon="dicecloud:code-braces"></iron-icon>
</div>
</template>