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

Update CW

This commit is contained in:
Daniel Supernault 2018-06-09 20:34:52 -06:00
parent 39c2adb656
commit 25bf33e64a
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Status.php
View File

@ -25,7 +25,7 @@ class Status extends Model
public function thumb()
{
if($this->media->count() == 0) {
if($this->media->count() == 0 || $this->is_nsfw) {
return "data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==";
}
return url(Storage::url($this->firstMedia()->thumbnail_path));

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=3cc7b07981e8b77e0db0",
"/css/app.css": "/css/app.css?id=d7fd6ff1b9b190f3a2eb",
"/css/app.css": "/css/app.css?id=77df28b24490646e50c8",
"/js/timeline.js": "/js/timeline.js?id=d9a3145c0cd21ca09172",
"/js/activity.js": "/js/activity.js?id=723dfb98bbbc96a9d39f"
}

11
resources/views/status/show.blade.php
View File

@ -16,7 +16,18 @@
</div>
</div>
<div class="col-12 col-md-8 status-photo px-0">
@if($status->is_nsfw)
<details class="details-animated">
<p>
<summary>NSFW / Hidden Image</summary>
<a class="max-hide-overflow" href="{{$status->url()}}">
<img class="card-img-top" src="{{$status->mediaUrl()}}">
</a>
</p>
</details>
@else
<img src="{{$status->mediaUrl()}}" width="100%">
@endif
</div>
<div class="col-12 col-md-4 px-0 d-flex flex-column border-left border-md-left-0">
<div class="d-md-flex d-none align-items-center justify-content-between card-header py-3 bg-white">

2
resources/views/status/template.blade.php
View File

@ -29,7 +29,7 @@
</div>
</div>
@if($item->is_nsfw)
<details>
<details class="details-animated">
<p>
<summary>NSFW / Hidden Image</summary>
<a class="max-hide-overflow" href="{{$item->url()}}">