chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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
parent 5537ab6571 fba1e2acf7
commit 7a37bfe8b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,7 +8,7 @@
"/js/compose.js": "/js/compose.js?id=4d8c53b4575f463214f2",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=b77da472ed4a9318b107",
"/js/profile.js": "/js/profile.js?id=ccd37b56f75f589d7402",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf",
"/js/timeline.js": "/js/timeline.js?id=8851cf4695b3bb2d1a03"

4
resources/assets/js/components/Profile.vue
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) {