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

Frontend ui refactor
This commit is contained in:
daniel 2019-04-29 16:10:43 -06:00 committed by GitHub
commit 7a37bfe8b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions

BIN
public/js/profile.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -358,7 +358,7 @@
<div class="card-columns" v-if="mode == 'grid'">
<div class="p-sm-2 p-md-3" v-for="(s, index) in timeline">
<a class="card info-overlay card-md-border-0" :href="s.url">
<img :src="s.media_attachments[0].url" class="img-fluid">
<img :src="previewUrl(s)" class="img-fluid">
</a>
</div>
</div>
@ -612,7 +612,7 @@ export default {
},
previewUrl(status) {
return status.media_attachments[0].preview_url;
return status.sensitive ? '/storage/no-preview.png?v=' + new Date().getTime() : status.media_attachments[0].preview_url;
},
previewBackground(status) {