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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-07-20 19:31:21 -06:00 committed by GitHub
parent 418a478109 b7ce72972e
commit 56af6ffb92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 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

@ -17,7 +17,7 @@
"/js/hashtag.js": "/js/hashtag.js?id=b4ffe6499880acf0591c", "/js/hashtag.js": "/js/hashtag.js?id=b4ffe6499880acf0591c",
"/js/loops.js": "/js/loops.js?id=214f31fc6c2d990487d8", "/js/loops.js": "/js/loops.js?id=214f31fc6c2d990487d8",
"/js/mode-dot.js": "/js/mode-dot.js?id=8224e306cf53e3336620", "/js/mode-dot.js": "/js/mode-dot.js?id=8224e306cf53e3336620",
"/js/profile.js": "/js/profile.js?id=56aca6209960f8ac2110", "/js/profile.js": "/js/profile.js?id=61a9ed24eae58ba628bf",
"/js/quill.js": "/js/quill.js?id=9edfe94c043a1bc68860", "/js/quill.js": "/js/quill.js?id=9edfe94c043a1bc68860",
"/js/search.js": "/js/search.js?id=b1bd588d07e682f8fce5", "/js/search.js": "/js/search.js?id=b1bd588d07e682f8fce5",
"/js/status.js": "/js/status.js?id=248bb6c2bec534e81503", "/js/status.js": "/js/status.js?id=248bb6c2bec534e81503",

13
resources/assets/js/components/Profile.vue
View File

@ -356,7 +356,14 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12 row mx-0"> <div class="col-12 row mx-0">
<div class="col-4"></div> <div class="col-4 text-left mt-2">
<span v-if="relationship && relationship.followed_by">
<span class="bg-light border border-secondary font-weight-bold small py-1 px-2 text-muted rounded">FOLLOWS YOU</span>
</span>
<span v-if="profile.is_admin">
<span class="bg-light border border-danger font-weight-bold small py-1 px-2 text-danger rounded">ADMIN</span>
</span>
</div>
<div class="col-4 text-center"> <div class="col-4 text-center">
<div class="d-block d-md-none"> <div class="d-block d-md-none">
<img class="rounded-circle box-shadow" :src="profile.avatar" width="110px" height="110px" style="margin-top:-60px; border: 5px solid #fff"> <img class="rounded-circle box-shadow" :src="profile.avatar" width="110px" height="110px" style="margin-top:-60px; border: 5px solid #fff">
@ -666,6 +673,10 @@
}, },
ownerCheck() { ownerCheck() {
if($('body').hasClass('loggedIn') == false) {
this.owner = false;
return;
}
this.owner = this.profile.id === this.user.id; this.owner = this.profile.id === this.user.id;
}, },