mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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

Update Timeline.vue, fix avatar height bug in Firefox
This commit is contained in:
daniel 2018-12-16 02:56:58 -07:00 committed by GitHub
parent ba81ffbbbb bb99b87144
commit 0752c66e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/components.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/components.js": "/js/components.js?id=2ffbe4bbb945b6f9728a",
"/js/components.js": "/js/components.js?id=8998b5c828642646b512",
"/js/app.js": "/js/app.js?id=763d01bb175be69c8ad3",
"/css/app.css": "/css/app.css?id=986cee6cfca852babf8e",
"/js/timeline.js": "/js/timeline.js?id=415bfde862ab8c5b4548",

2
resources/assets/js/components/Timeline.vue
View File

@ -146,7 +146,7 @@
</div>
<div class="card-body pt-2 contents" style="max-height: 300px; overflow-y: scroll;">
<div class="media mb-3 align-items-center" v-for="(n, index) in notifications">
<img class="mr-2 rounded-circle img-thumbnail" :src="n.account.avatar" alt="" width="32px" height="32px">
<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px">
<div class="media-body font-weight-light small">
<div v-if="n.type == 'favourite'">
<p class="my-0">