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

* 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

View File

@@ -3,16 +3,17 @@
.row .row
.col-md-6.offset-3 .col-md-6.offset-3
h1 {{ $t('merch') }} 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") .col-lg-6.col-md-6.col-sm-12(v-for="(merchant, index) in merchants")
.merch-block .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 }} h2(v-else) {{ merchant.name }}
div div
a(:href="merchant.link" target='_blank') 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') }} p {{ $t('merch-' + merchant.key + '-summary') }}
a.btn.btn-primary(:href="merchant.link" target='_blank') {{$t('merch-' + merchant.key + '-goto')}} a.btn.btn-primary(:href="merchant.link" target='_blank') {{$t('merch-' + merchant.key + '-goto')}}
</template> </template>
<script> <script>

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 306 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

Before

Width:  |  Height:  |  Size: 394 KiB

After

Width:  |  Height:  |  Size: 394 KiB