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

Merge pull request #4735 from pixelfed/staging 

Update vue components, fix typos
This commit is contained in:
daniel 2023-11-03 21:38:02 -06:00 committed by GitHub
parent e45ede5a12 a3fd0b032b
commit 091fa1a62b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/components/partials/post/PostReactions.vue
View File

@ -5,7 +5,7 @@
Liked by Liked by
<span v-if="status.favourites_count == 1 && status.favourited == true" class="font-weight-bold">me</span> <span v-if="status.favourites_count == 1 && status.favourited == true" class="font-weight-bold">me</span>
<span v-else> <span v-else>
<router-link :to="'/i/web/profile/' + status.liked_by.id" class="primary font-weight-bold"">&commat;{{ status.liked_by.username}}</router-link> <router-link :to="'/i/web/profile/' + status.liked_by.id" class="primary font-weight-bold">{{ status.liked_by.username}}</router-link>
<span v-if="status.liked_by.others || status.favourites_count > 1"> <span v-if="status.liked_by.others || status.favourites_count > 1">
and <a href="#" class="primary font-weight-bold" @click.prevent="showLikes()">{{ count(status.favourites_count - 1) }} others</a> and <a href="#" class="primary font-weight-bold" @click.prevent="showLikes()">{{ count(status.favourites_count - 1) }} others</a>
</span> </span>

1
resources/assets/components/partials/profile/ProfileHoverCard.vue
View File

@ -45,7 +45,6 @@
:href="profile.url" :href="profile.url"
@click.prevent="goToProfile()" @click.prevent="goToProfile()"
v-html="getDisplayName()"> v-html="getDisplayName()">
{{ profile.display_name ? profile.display_name : profile.username }}
</a> </a>
</p> </p>

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

@ -29,7 +29,7 @@
<div v-for="(m, index) in cameraRollMedia" :class="[index == 0 ? 'col-12 p-0' : 'col-3 p-0']"> <div v-for="(m, index) in cameraRollMedia" :class="[index == 0 ? 'col-12 p-0' : 'col-3 p-0']">
<div class="card info-overlay p-0 rounded-0 shadow-none border"> <div class="card info-overlay p-0 rounded-0 shadow-none border">
<div class="square"> <div class="square">
<img class="square-content" :src="m.preview_url"></img> <img class="square-content" :src="m.preview_url" />
</div> </div>
</div> </div>
</div> </div>

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

@ -238,7 +238,7 @@
</div> </div>
</div> </div>
<div v-else-if="tabIndex === 'Share'" class="col-12 col-md-8 bg-dark mt-3 py-2 rounded" key="0"> <div v-else-if="tabIndex === 'Share'" class="col-12 col-md-8 bg-dark mt-3 py-2 rounded" key="3">
<div class="py-2"> <div class="py-2">
<p class="text-muted">Portfolio URL</p> <p class="text-muted">Portfolio URL</p>
<p class="lead mb-0"><a :href="settings.url">{{ settings.url }}</a></p> <p class="lead mb-0"><a :href="settings.url">{{ settings.url }}</a></p>

4
resources/assets/js/components/partials/CommentFeed.vue
View File

@ -18,8 +18,8 @@
</div> </div>
</div> </div>
<div v-if="composeText" class="reply-options" v-model="visibility"> <div v-if="composeText" class="reply-options">
<select class="form-control form-control-sm rounded-pill font-weight-bold"> <select class="form-control form-control-sm rounded-pill font-weight-bold" v-model="visibility">
<option value="public">Public</option> <option value="public">Public</option>
<option value="private">Followers Only</option> <option value="private">Followers Only</option>
</select> </select>

2
resources/assets/js/components/partials/StatusCard.vue
View File

@ -8,7 +8,6 @@
<div class="media-body"> <div class="media-body">
<div class="pl-2 d-flex align-items-top"> <div class="pl-2 d-flex align-items-top">
<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)"> <a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
Loading...
</a> </a>
<span class="px-1 text-lighter"> <span class="px-1 text-lighter">
· ·
@ -61,7 +60,6 @@
</div> </div>
<div class="pl-2"> <div class="pl-2">
<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)"> <a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
Loading...
</a> </a>
<span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;"> <span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
<i class="fas fa-certificate text-danger fa-stack-1x"></i> <i class="fas fa-certificate text-danger fa-stack-1x"></i>