mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-23 05:23:17 +00:00
Merge pull request #2843 from pixelfed/staging
Update RemotePost.vue, fix content warning button.
This commit is contained in:
commit
25fb62e43f
4 changed files with 4 additions and 3 deletions
|
@ -44,6 +44,7 @@
|
|||
- Updated NotificationService, use zrevrangebyscore for api. ([d43e6d8d](https://github.com/pixelfed/pixelfed/commit/d43e6d8d))
|
||||
- Updated ApiV1Controller, use PublicTimelineService. ([f67c67bc](https://github.com/pixelfed/pixelfed/commit/f67c67bc))
|
||||
- Updated ApiV1Controller, use ProfileService for verify_credentials. ([352aa573](https://github.com/pixelfed/pixelfed/commit/352aa573))
|
||||
- Updated RemotePost.vue, fix content warning button. ([7647e724](https://github.com/pixelfed/pixelfed/commit/7647e724))
|
||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||
|
||||
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)
|
||||
|
|
BIN
public/js/rempos.js
vendored
BIN
public/js/rempos.js
vendored
Binary file not shown.
Binary file not shown.
|
@ -46,7 +46,7 @@
|
|||
<div class="col-12 col-md-8 px-0 mx-0">
|
||||
<div class="postPresenterContainer d-none d-flex justify-content-center align-items-center" style="background: #000;">
|
||||
<div v-if="status.pf_type === 'photo'" class="w-100">
|
||||
<photo-presenter :status="status"></photo-presenter>
|
||||
<photo-presenter :status="status" v-on:togglecw="status.sensitive = false"></photo-presenter>
|
||||
</div>
|
||||
|
||||
<div v-else-if="status.pf_type === 'video'" class="w-100">
|
||||
|
@ -106,12 +106,12 @@
|
|||
<div class="card-body status-comments pt-0">
|
||||
<div class="status-comment">
|
||||
<div v-if="status.content.length" class="pt-3">
|
||||
<div v-if="showCaption != true">
|
||||
<div v-if="status.sensitive">
|
||||
<span class="py-3">
|
||||
<a class="text-dark font-weight-bold mr-1" :href="profileUrl" v-bind:title="status.account.username">{{truncate(status.account.username,15)}}</a>
|
||||
<span class="text-break">
|
||||
<span class="font-italic text-muted">This comment may contain sensitive material</span>
|
||||
<span class="text-primary cursor-pointer pl-1" @click="showCaption = true">Show</span>
|
||||
<span class="text-primary cursor-pointer pl-1" @click="status.sensitive = false">Show</span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue