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

Merge pull request #2044 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2020-02-22 01:41:51 -07:00 committed by GitHub
commit 80f76eaf14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/app.css vendored
View file

Binary file not shown.

BIN
public/css/appdark.css vendored
View file

Binary file not shown.

BIN
public/css/landing.css vendored
View file

Binary file not shown.

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

22
resources/assets/js/components/Profile.vue
View file

@ -360,9 +360,10 @@
hide-footer hide-footer
centered centered
title="Following" title="Following"
body-class="list-group-flush p-0"> body-class="list-group-flush py-3 px-0"
dialog-class="follow-modal">
<div class="list-group"> <div class="list-group">
<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index"> <div class="list-group-item border-0 py-1" v-for="(user, index) in following" :key="'following_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy"> <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
@ -378,7 +379,7 @@
</p> </p>
</div> </div>
<div v-if="owner"> <div v-if="owner">
<a class="btn btn-outline-secondary btn-sm" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Unfollow</a> <a class="btn btn-outline-dark btn-sm font-weight-bold" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Following</a>
</div> </div>
</div> </div>
</div> </div>
@ -397,23 +398,26 @@
hide-footer hide-footer
centered centered
title="Followers" title="Followers"
body-class="list-group-flush p-0"> body-class="list-group-flush py-3 px-0"
dialog-class="follow-modal"
>
<div class="list-group"> <div class="list-group">
<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index"> <div class="list-group-item border-0 py-1" v-for="(user, index) in followers" :key="'follower_'+index">
<div class="media"> <div class="media mb-0">
<a :href="user.url"> <a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy"> <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" height="30px" loading="lazy">
</a> </a>
<div class="media-body"> <div class="media-body mb-0">
<p class="mb-0" style="font-size: 14px"> <p class="mb-0" style="font-size: 14px">
<a :href="user.url" class="font-weight-bold text-dark"> <a :href="user.url" class="font-weight-bold text-dark">
{{user.username}} {{user.username}}
</a> </a>
</p> </p>
<p class="text-muted mb-0" style="font-size: 14px"> <p class="text-secondary mb-0" style="font-size: 13px">
{{user.display_name}} {{user.display_name}}
</p> </p>
</div> </div>
<!-- <button class="btn btn-primary font-weight-bold btn-sm py-1">FOLLOW</button> -->
</div> </div>
</div> </div>
<div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()"> <div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()">

4
resources/assets/sass/custom.scss vendored
View file

@ -562,3 +562,7 @@ details summary::-webkit-details-marker {
.status-content > p:first-child { .status-content > p:first-child {
display: inline; display: inline;
} }
.follow-modal {
max-width: 400px !important;
}