1
0
Fork 0

Merge pull request #1341 from pixelfed/frontend-ui-refactor

Frontend ui refactor
This commit is contained in:
daniel 2019-06-03 19:57:09 -06:00 committed by GitHub
commit 9483b58719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

2
public/js/loops.js vendored

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
"/js/compose.js": "/js/compose.js?id=f69f248dc1cfcb8ae092", "/js/compose.js": "/js/compose.js?id=f69f248dc1cfcb8ae092",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8", "/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=0625385218493e556ccc", "/js/discover.js": "/js/discover.js?id=0625385218493e556ccc",
"/js/loops.js": "/js/loops.js?id=37e6648f5124600735a1", "/js/loops.js": "/js/loops.js?id=04604e13614f26617f27",
"/js/profile.js": "/js/profile.js?id=257d02b221142438d173", "/js/profile.js": "/js/profile.js?id=257d02b221142438d173",
"/js/search.js": "/js/search.js?id=27e8be8bfef6be586d25", "/js/search.js": "/js/search.js?id=27e8be8bfef6be586d25",
"/js/status.js": "/js/status.js?id=fb2f77026b548814adc3", "/js/status.js": "/js/status.js?id=fb2f77026b548814adc3",

View File

@ -12,7 +12,7 @@
<div class="col-12 col-md-4 mb-3" v-for="(loop, index) in loops"> <div class="col-12 col-md-4 mb-3" v-for="(loop, index) in loops">
<div class="card border border-success"> <div class="card border border-success">
<div class="embed-responsive embed-responsive-1by1"> <div class="embed-responsive embed-responsive-1by1">
<video class="embed-responsive-item" :src="videoSrc(loop)" preload="auto" width="100%" height="100%" loop @click="toggleVideo(loop, $event)"></video> <video class="embed-responsive-item" :src="videoSrc(loop)" preload="none" width="100%" height="100%" loop @click="toggleVideo(loop, $event)" :poster="posterSrc(loop)"></video>
</div> </div>
<div class="card-body"> <div class="card-body">
<p class="username font-weight-bolder lead d-flex justify-content-between"><a :href="loop.account.url">{{loop.account.acct}}</a> <a :href="loop.url">{{timestamp(loop)}}</a></p> <p class="username font-weight-bolder lead d-flex justify-content-between"><a :href="loop.account.url">{{loop.account.acct}}</a> <a :href="loop.url">{{timestamp(loop)}}</a></p>
@ -78,6 +78,9 @@ export default {
videoSrc(loop) { videoSrc(loop) {
return loop.media_attachments[0].url; return loop.media_attachments[0].url;
}, },
posterSrc(loop) {
return loop.media_attachments[0].preview_url;
},
setTab(tab) { setTab(tab) {
this.tab = tab; this.tab = tab;
}, },