sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-18 01:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into enable-repeatables

Browse source
This commit is contained in:
Keith Holliday 2017-05-22 07:49:01 -06:00
commit c0117706e4
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/client/components/inventory/equipment.vue
View file

@ -65,8 +65,8 @@
v-for="(label, group) in gearTypesToStrings",
:key="group",
:item="flatGear[activeItems[group]]",
:itemContentClass="'shop_' + flatGear[activeItems[group]].key",
:showPopover="flatGear[activeItems[group]] && flatGear[activeItems[group]].key.indexOf('_base_0') === -1",
:itemContentClass="flatGear[activeItems[group]] ? 'shop_' + flatGear[activeItems[group]].key : null",
:showPopover="!!flatGear[activeItems[group]] && flatGear[activeItems[group]].key.indexOf('_base_0') === -1",
:label="$t(label)",
:selected="true",
:popoverPosition="'top'",

8
website/client/components/inventory/equipmentAttributesPopover.vue
View file

@ -1,10 +1,10 @@
<template lang="pug">
div
h4.popover-content-title(v-once) {{ item.text() }}
.popover-content-text(v-once) {{ item.notes() }}
h4.popover-content-title {{ item.text() }}
.popover-content-text {{ item.notes() }}
.popover-content-attr(v-for="attr in ATTRIBUTES", :key="attr", v-once)
span.popover-content-attr-key(v-once) {{ `${$t(attr)}: ` }}
span.popover-content-attr-val(v-once) {{ `+${item[attr]}` }}
span.popover-content-attr-key {{ `${$t(attr)}: ` }}
span.popover-content-attr-val {{ `+${item[attr]}` }}
</template>
<script>

2
website/client/components/inventory/item.vue
View file

@ -37,7 +37,7 @@ export default {
type: Object,
},
itemContentClass: {
type: String
type: String,
},
selected: {
type: Boolean,