Skip to content

Commit

Permalink
Merge branch 'master' of github.com:massif-press/compcon
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnny committed Jul 2, 2020
2 parents c511f52 + 2caae02 commit cc945be
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ui/components/cards/npc/cards/_ReactionCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@remove-feature="$emit('remove-feature', $event)"
@recalc="$emit('recalc')"
>
<span class="overline">TRIGGER</span>
<span v-if="item.Feature.Trigger" class="overline">TRIGGER</span>
<p class="panel body-1 mb-0" v-html="item.Feature.Trigger" />
<span class="overline">EFFECT</span>
<p v-if="item.Tier" class="body-1 mb-0" v-html="item.Feature.EffectByTier(item.Tier)" />
Expand Down

0 comments on commit cc945be

Please sign in to comment.