UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-14 02:24:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-07-20 19:31:21 -06:00 committed by GitHub
commit 56af6ffb92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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;
}, },