Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-02-13 09:09:31 +01:00
commit 7e1bd1ad07
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
16 changed files with 272 additions and 35 deletions

View file

@ -42,17 +42,15 @@
v-if="result"
v-masonry
transition-duration="0"
item-selector=".column"
item-selector=".card"
percent-position="true"
stagger="0"
class="ui stackable three column doubling grid">
<div
v-masonry-tile
v-if="result.results.length > 0"
v-for="artist in result.results"
:key="artist.id"
class="column">
<artist-card class="fluid" :artist="artist"></artist-card>
stagger="0">
<div v-if="result.results.length > 0" class="ui cards">
<artist-card
v-masonry-tile
v-for="artist in result.results"
:key="artist.id"
:artist="artist"></artist-card>
</div>
</div>
<div class="ui center aligned basic segment">

View file

@ -64,17 +64,18 @@
v-if="result"
v-masonry
transition-duration="0"
item-selector=".column"
item-selector=".card"
percent-position="true"
stagger="0"
class="ui stackable three column doubling grid">
stagger="0">
<div
v-masonry-tile
v-if="result.results.length > 0"
v-for="radio in result.results"
:key="radio.id"
class="column">
<radio-card class="fluid" type="custom" :custom-radio="radio"></radio-card>
class="ui cards">
<radio-card
type="custom"
v-masonry-tile
v-for="radio in result.results"
:key="radio.id"
:custom-radio="radio"></radio-card>
</div>
</div>
<div class="ui center aligned basic segment">