krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes on Merchandise Page [Fixes Issues #9144] (#9195)

Browse Source 
* Moved pictures of merch items from assets/images/merch/ to /website/static/merch
Image src in merch.vue is linked to the new path.

* Rebased and fixed.

* Reverted changes of package-lock.json
This commit is contained in:
tim1234ltp
2017-10-17 23:48:23 +08:00
committed by Sabe Jones
parent d5305f74e3
commit ad50f90ba0
14 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/client/components/static/merch.vue
View File

@@ -3,16 +3,17 @@
.row
.col-md-6.offset-3
h1 {{ $t('merch') }}
// @TODO: how do we use static images here?
// @TODO: Visual experience: Separate each merch items with new line? Or to show items in a table?
.col-lg-6.col-md-6.col-sm-12(v-for="(merchant, index) in merchants")
.merch-block
img(v-if='merchant.logo' :src="`~assets/images/merch/${merchant.key}-logo.png`")
img(v-if='merchant.logo' :src="`/static/merch/${merchant.key}-logo.png`")
h2(v-else) {{ merchant.name }}
div
a(:href="merchant.link" target='_blank')
img.img-rendering-auto(:src="`~assets/images/merch/${merchant.key}.png`")
img.img-rendering-auto(:src="`/static/merch/${merchant.key}.png`")
p {{ $t('merch-' + merchant.key + '-summary') }}
a.btn.btn-primary(:href="merchant.link" target='_blank') {{$t('merch-' + merchant.key + '-goto')}}
</template>
<script>