Skip to content

Commit

Permalink
style: adjusted favorite resource/progress styling
Browse files Browse the repository at this point in the history
  • Loading branch information
@spyrella
spyrella committed Mar 20, 2024
1 parent 84fe8c1 commit 4ea6851
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 36 deletions.
42 changes: 33 additions & 9 deletions templates/actor/partials/actor-favorite.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,23 @@
<div class="flexrow">
{{!-- Item Name --}}
{{> "systems/projectfu/templates/actor/partials/actor-item-name.hbs" item=item}}
{{!-- Class Features --}}
{{#if (eq item.type 'classFeature')}}
{{#with (lookup @root.classFeatures item.system.featureType) as | featureType |}}
{{#with (lookup featureType.items item._id) as | itemData |}}
{{> (lookup featureType.feature 'previewTemplate') itemData.item additionalData=itemData.additionalData item=itemData.item}}
{{/with}}
{{/with}}
{{/if}}
{{!-- Class Features --}}
{{#if (eq item.type 'classFeature')}}
{{#with (lookup @root.classFeatures item.system.featureType) as | featureType |}}
{{#with (lookup featureType.items item._id) as | itemData |}}
{{> (lookup featureType.feature 'previewTemplate') itemData.item additionalData=itemData.additionalData
item=itemData.item}}
{{/with}}
{{/with}}
{{/if}}
{{!-- Item Equip--}}
{{#if (or (eq @root.actor.type "character") @root.actor.system.useEquipment.value)}}
{{> "systems/projectfu/templates/actor/partials/actor-equip.hbs" actor=actor item=item}}
{{/if}}

{{!-- Resource Points --}}
{{#if item.system.hasResource.value}}
<div class="item-m flexcol flex-group-center resource-content">
<div class="item-l desc flexrow flex-group-center resource-content" style="padding: 0">
<label class="item-quality resource-text-sm">{{ item.system.rp.name }}</label>
<div class="resource-text-m buttons-inc">
<a class="decrement-button" data-type="resourceCounter" data-item-id="{{ item._id }}">-</a>
Expand All @@ -55,6 +56,29 @@
</div>
{{/if}}

{{#if (eq item.type "project")}}
{{!-- Progress Bar --}}
<div class="item-progressbar">
<div class="bar bar-progress">
<div class="bar-progress-bar bar-project"
style="width: {{calculatePercentage item.system.progress.current item.system.progress.max}};">
</div>
<span class="bar-value"></span>
</div>
</div>
{{!-- Progress Counter --}}
<div class="item-m desc flexcol flex-group-center resource-content"
style="padding: 0px; border-radius: 6px 12px 12px 6px;">
<div class="resource-text-m buttons-inc">
<a class="decrement-button" data-type="projectCounter" data-item-id="{{ item._id }}">-</a>
<span data-resource="item.rp">{{ item.system.progress.current }}</span>
<span>/</span>
<span>{{ item.system.progress.max }}</span>
<a class="increment-button" data-type="projectCounter" data-item-id="{{ item._id }}">+</a>
</div>
</div>
{{/if}}

{{!-- Item Control--}}
{{> "systems/projectfu/templates/actor/partials/actor-control.hbs" item=item}}
</div>
Expand Down
14 changes: 5 additions & 9 deletions templates/actor/sections/actor-section-classes.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{!-- Item Name--}}
{{> "systems/projectfu/templates/actor/partials/actor-item-name.hbs" item=item}}
{{!-- Class Level --}}
<div class="item-m buttons-inc">
<div class="item-m desc buttons-inc" style="padding:0">
<a class="decrement-button" data-type="levelCounter" data-item-id="{{ item._id }}">-</a>
<span data-resource="item.level">{{ item.level }}</span>
<span>/</span>
Expand Down Expand Up @@ -82,16 +82,14 @@
<div class="item-m flexcol flex-group-center resource-content">
<label class="item-quality resource-text-sm">{{ item.system.rp.name }}</label>
<div class="resource-text-m buttons-inc" style="padding: 0 4px;">
<a class="decrement-button" data-type="resourceCounter"
data-item-id="{{ item._id }}">-</a>
<a class="decrement-button" data-type="resourceCounter" data-item-id="{{ item._id }}">-</a>
<span data-resource="item.rp">{{ item.system.rp.current }}</span>
{{#if (gt item.system.rp.max 0)}}
<span>/</span>
<span>{{ item.system.rp.max }}</span>
{{/if}}

<a class="increment-button" data-type="resourceCounter"
data-item-id="{{ item._id }}">+</a>
<a class="increment-button" data-type="resourceCounter" data-item-id="{{ item._id }}">+</a>
</div>
</div>
{{/if}}
Expand Down Expand Up @@ -152,16 +150,14 @@
<div class="item-m flexcol flex-group-center resource-content">
<label class="item-quality resource-text-sm">{{ item.system.rp.name }}</label>
<div class="resource-text-m buttons-inc" style="padding: 0 4px;">
<a class="decrement-button" data-type="resourceCounter"
data-item-id="{{ item._id }}">-</a>
<a class="decrement-button" data-type="resourceCounter" data-item-id="{{ item._id }}">-</a>
<span data-resource="item.rp">{{ item.system.rp.current }}</span>
{{#if (gt item.system.rp.max 0)}}
<span>/</span>
<span>{{ item.system.rp.max }}</span>
{{/if}}

<a class="increment-button" data-type="resourceCounter"
data-item-id="{{ item._id }}">+</a>
<a class="increment-button" data-type="resourceCounter" data-item-id="{{ item._id }}">+</a>
</div>
</div>
{{/if}}
Expand Down
16 changes: 12 additions & 4 deletions templates/actor/sections/actor-section-combat.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</div>
{{!-- Resource Points --}}
{{#if item.system.hasResource.value}}
<div class="item-m flexcol flex-group-center resource-content">
<div class="item-m desc flexcol flex-group-center resource-content">
<label class="item-quality resource-text-sm">{{ item.system.rp.name }}</label>
<div class="resource-text-m buttons-inc" style="padding: 0 4px;">
<a class="decrement-button" data-type="resourceCounter" data-item-id="{{ item._id }}">-</a>
Expand All @@ -97,19 +97,22 @@
<span>/</span>
<span>{{ item.system.rp.max }}</span>
{{/if}}

<a class="increment-button" data-type="resourceCounter" data-item-id="{{ item._id }}">+</a>
</div>
</div>
{{/if}}
{{!-- Clocks --}}
{{#if item.system.hasClock.value}}
<div class="item-sm" style="text-align: initial;">
<div class="item-m desc" style="text-align: initial; padding: 1px;">
<a class="decrement-button align-left" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-minus"></i></a>
<div class="progress-container">
{{> "systems/projectfu/templates/actor/partials/actor-progress-clock.hbs"
arr=item.progressArr
data=item.system.progress}}
</div>
<a class="increment-button align-right" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-plus"></i></a>
</div>
{{/if}}
{{!-- Item Control--}}
Expand Down Expand Up @@ -150,13 +153,18 @@
{{/if}}
</span>
</div>
{{!-- Clocks --}}
{{#if item.system.hasClock.value}}
<div class="item-sm" style="text-align: initial;">
<div class="item-m desc" style="text-align: initial; padding: 1px;">
<a class="decrement-button align-left" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-minus"></i></a>
<div class="progress-container">
{{> "systems/projectfu/templates/actor/partials/actor-progress-clock.hbs"
arr=item.progressArr
data=item.system.progress}}
</div>
<a class="increment-button align-right" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-plus"></i></a>
</div>
{{/if}}
{{> "systems/projectfu/templates/actor/partials/actor-control.hbs" item=item}}
Expand Down
38 changes: 24 additions & 14 deletions templates/actor/sections/actor-section-features.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="item-name">{{localize 'FU.Limit'}}</div>
<div class="item-lg">{{localize 'FU.LimitTrigger'}}</div>
<div class="item-lg">{{localize 'FU.LimitEffect'}}</div>
<div class="item-sm">{{localize 'FU.Clock'}}</div>
<div class="item-m">{{localize 'FU.Clock'}}</div>
<div class="item-sm end">
<div class="">
<a class="" aria-describedby="tooltip" data-tooltip="Activate {{localize 'FU.Limit'}}"
Expand All @@ -61,12 +61,17 @@
{{> "systems/projectfu/templates/actor/partials/actor-item-name.hbs" item=item}}
<div class="item-lg">{{ item.zeroTrigger }}</div>
<div class="item-lg">{{ item.zeroEffect }}</div>
<div class="item-sm" style="text-align: initial;">
{{!-- Clocks --}}
<div class="item-m desc" style="text-align: initial; padding: 1px;">
<a class="decrement-button align-left" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-minus"></i></a>
<div class="progress-container">
{{> "systems/projectfu/templates/actor/partials/actor-progress-clock.hbs"
arr=item.progressArr
data=item.system.progress}}
</div>
<a class="increment-button align-right" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-plus"></i></a>
</div>
{{!-- Item Control--}}
{{> "systems/projectfu/templates/actor/partials/actor-control.hbs" item=item}}
Expand Down Expand Up @@ -126,7 +131,7 @@
</div>
{{!-- Resource Points --}}
{{#if item.system.hasResource.value}}
<div class="item-m flexcol flex-group-center resource-content">
<div class="item-m desc flexcol flex-group-center resource-content">
<label class="item-quality resource-text-sm">{{ item.system.rp.name }}</label>
<div class="resource-text-m buttons-inc" style="padding: 0 4px;">
<a class="decrement-button" data-type="resourceCounter" data-item-id="{{ item._id }}">-</a>
Expand All @@ -135,22 +140,24 @@
<span>/</span>
<span>{{ item.system.rp.max }}</span>
{{/if}}

<a class="increment-button" data-type="resourceCounter" data-item-id="{{ item._id }}">+</a>
</div>
</div>
{{/if}}
{{!-- Clocks --}}
{{#if item.system.hasClock.value}}
<div class="item-sm" style="text-align: initial;">
<div class="item-m desc" style="text-align: initial; padding: 1px;">
<a class="decrement-button align-left" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-minus"></i></a>
<div class="progress-container">
{{> "systems/projectfu/templates/actor/partials/actor-progress-clock.hbs"
arr=item.progressArr
data=item.system.progress}}
</div>
<a class="increment-button align-right" data-type="clockCounter" data-item-id="{{ item._id }}"> <i
class="fas fa-plus"></i></a>
</div>
{{/if}}

{{!-- Item Control--}}
{{> "systems/projectfu/templates/actor/partials/actor-control.hbs" item=item}}
</div>
Expand All @@ -171,7 +178,7 @@
<li class="item flexrow items-header">
<div class="item-name">{{localize "FU.Projects"}}</div>
<div class="item-progressbar">{{localize "FU.ProjectStatus"}}</div>
<div class="item-lg">{{localize "FU.Progress"}}</div>
<div class="item-m">{{localize "FU.Progress"}}</div>
<div class="item-sm end">
<a class="item-control item-create" aria-describedby="tooltip"
data-tooltip="{{localize 'FU.ProjectCreate'}}" data-type="project">
Expand All @@ -185,7 +192,7 @@
<div class="flexrow">
{{!-- Item Name--}}
{{> "systems/projectfu/templates/actor/partials/actor-item-name.hbs" item=item}}

{{!-- Progress Bar --}}
<div class="item-progressbar">
<div class="bar bar-progress">
<div class="bar-progress-bar bar-project"
Expand All @@ -194,14 +201,17 @@
<span class="bar-value"></span>
</div>
</div>
<div class="resource-content flex-group-center buttons-inc">
<a class="decrement-button" data-type="projectCounter" data-item-id="{{ item._id }}">-</a>
<div class="item-quality resource-text-sm">{{ item.system.progress.current }} / {{
item.system.progress.max }}
{{!-- Progress Counter --}}
<div class="item-m desc flexcol flex-group-center resource-content"
style="padding: 0px; border-radius: 6px 12px 12px 6px;">
<div class="resource-text-m buttons-inc">
<a class="decrement-button" data-type="projectCounter" data-item-id="{{ item._id }}">-</a>
<span data-resource="item.rp">{{ item.system.progress.current }}</span>
<span>/</span>
<span>{{ item.system.progress.max }}</span>
<a class="increment-button" data-type="projectCounter" data-item-id="{{ item._id }}">+</a>
</div>
<a class="increment-button" data-type="projectCounter" data-item-id="{{ item._id }}">+</a>
</div>

{{!-- Item Control--}}
{{> "systems/projectfu/templates/actor/partials/actor-control.hbs" item=item}}
</div>
Expand Down

0 comments on commit 4ea6851

Please sign in to comment.