MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '468-fix-loading-browse' into 'develop' 

Resolve "Refreshing lists on browse page is causing the div to go down"

Closes #468

See merge request funkwhale/funkwhale!367
This commit is contained in:
Eliot Berriot 2018-07-31 16:14:51 +00:00
parent 761433e3f9 c539195d04
commit ac8553a521
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/468.bugfix Normal file
View File

@ -0,0 +1 @@
Fix loading on browse page lists causing them to go down, and dimming over the top bar (#468)

2
front/src/App.vue
View File

@ -250,7 +250,7 @@ html, body {
left: 350px; left: 350px;
right: 0px; right: 0px;
top: 0px; top: 0px;
z-index: 1; z-index: 2000;
} }
background-color: white; background-color: white;
.item { .item {

9
front/src/components/audio/track/Widget.vue
View File

@ -10,9 +10,6 @@
<i @click="fetchData(url)" :class="['ui', 'circular', 'medium', 'refresh', 'icon']"> <i @click="fetchData(url)" :class="['ui', 'circular', 'medium', 'refresh', 'icon']">
</i> </i>
<div class="ui divided unstackable items"> <div class="ui divided unstackable items">
<div v-if="isLoading" class="ui inverted active dimmer">
<div class="ui loader"></div>
</div>
<div class="item" v-for="object in objects" :key="object.id"> <div class="item" v-for="object in objects" :key="object.id">
<div class="ui tiny image"> <div class="ui tiny image">
<img v-if="object.track.album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](object.track.album.cover.medium_square_crop)"> <img v-if="object.track.album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](object.track.album.cover.medium_square_crop)">
@ -45,6 +42,9 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="isLoading" class="ui inverted active dimmer">
<div class="ui loader"></div>
</div>
</div> </div>
</div> </div>
</template> </template>
@ -126,4 +126,7 @@ export default {
.refresh.icon { .refresh.icon {
float: right; float: right;
} }
.ui.divided.items > .item:last-child {
padding-bottom: 1em !important;
}
</style> </style>