Skip to content

Commit

Permalink
Merge pull request #135 from RabidOwlbear/armor-tag
Browse files Browse the repository at this point in the history
Armor tag
  • Loading branch information
anthonyronda authored Mar 8, 2022
2 parents 155617e + 3fc68df commit 96e38d6
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
5 changes: 5 additions & 0 deletions src/scss/character.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@
}
}
}
/* tag overflow */
.tag-row {
display: flex;
overflow: hidden;
}
/* ----------------------------------------- */
/* Item Controls */
/* ----------------------------------------- */
Expand Down
2 changes: 1 addition & 1 deletion src/templates/actors/partials/character-inventory-tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
style="background-image: url({{item.img}})"
></div>
<h4 class="item-name" title="{{item.name}}">{{item.name~}}</h4>
<div class="icon-row flexrow">
<div class="tag-row icon-row">
{{#each item.data.data.manualTags as |tag|}} {{#if (getTagIcon
tag.value)}}
<img
Expand Down
16 changes: 15 additions & 1 deletion src/templates/items/armor-sheet.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,25 @@
<h1 class="charname">
<input name="name" type="text" value="{{name}}" placeholder="Name" />
</h1>
</div>
<ol class="tag-list">
{{#each data.manualTags as |tag|}}
<li class="tag" title="{{tag.title}}" data-tag="{{tag.value}}">
<span>{{tag.value}}</span>
<a class="tag-delete"><i class="fas fa-times"></i></a>
</li>
{{/each}}
</ol>
</div>
</header>
<section class="sheet-body">
<div class="flexrow">
<div class="stats">
<div class="form-group">
<div class="form-fields">
<input type="text" data-action="add-tag" title="{{localize 'OSE.items.typeTag'}}"
placeholder="{{localize 'OSE.items.enterTag'}}" />
</div>
</div>
<div class="form-group">
<label>{{localize 'OSE.items.ArmorAC'}}</label>
<div class="form-fields">
Expand Down
14 changes: 14 additions & 0 deletions src/templates/items/item-sheet.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,25 @@
<h1 class="charname">
<input name="name" type="text" value="{{name}}" placeholder="Name" />
</h1>
<ol class="tag-list">
{{#each data.manualTags as |tag|}}
<li class="tag" title="{{tag.title}}" data-tag="{{tag.value}}">
<span>{{tag.value}}</span>
<a class="tag-delete"><i class="fas fa-times"></i></a>
</li>
{{/each}}
</ol>
</div>
</header>
<section class="sheet-body">
<div class="flexrow">
<div class="stats">
<div class="form-group">
<div class="form-fields">
<input type="text" data-action="add-tag" title="{{localize 'OSE.items.typeTag'}}"
placeholder="{{localize 'OSE.items.enterTag'}}" />
</div>
</div>
<div class="form-group">
<label>{{localize 'OSE.items.Quantity'}}</label>
<div class="form-fields">
Expand Down

0 comments on commit 96e38d6

Please sign in to comment.