Merge branch 'frontend-ui-refactor' into patch-11
This commit is contained in:
commit
1fa27770b8
|
@ -13,7 +13,9 @@ class StatusController extends Controller
|
|||
public function show(Request $request, $username, int $id)
|
||||
{
|
||||
$user = Profile::whereUsername($username)->firstOrFail();
|
||||
$status = Status::whereProfileId($user->id)->findOrFail($id);
|
||||
$status = Status::whereProfileId($user->id)
|
||||
->withCount('likes')
|
||||
->findOrFail($id);
|
||||
if(!$status->media_path && $status->in_reply_to_id) {
|
||||
return view('status.reply', compact('user', 'status'));
|
||||
}
|
||||
|
|
2
public/css/app.css
vendored
2
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"/js/app.js": "/js/app.js?id=61fbf8a62fd91adec191",
|
||||
"/css/app.css": "/css/app.css?id=f84f401eb57216e39ebf",
|
||||
"/css/app.css": "/css/app.css?id=2adbd5cda2450424aa06",
|
||||
"/js/timeline.js": "/js/timeline.js?id=fcc86a9419b33a821c23"
|
||||
}
|
23
resources/assets/sass/custom.scss
vendored
23
resources/assets/sass/custom.scss
vendored
|
@ -56,37 +56,14 @@ body, button, input, textarea {
|
|||
}
|
||||
|
||||
.card.status-container .status-photo {
|
||||
display: block !important;
|
||||
margin: auto !important;
|
||||
}
|
||||
|
||||
.card.status-container .status-comments {
|
||||
height: 220px;
|
||||
overflow-y: scroll;
|
||||
border-bottom:1px solid rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.card.status-container.orientation-square .status-comments {
|
||||
height: 360px !important;
|
||||
}
|
||||
|
||||
|
||||
.card.status-container.orientation-portrait .status-comments {
|
||||
height: 528px !important;
|
||||
}
|
||||
|
||||
.card.status-container.orientation-landscape .status-photo img {
|
||||
max-height: 451px !important;
|
||||
}
|
||||
|
||||
.card.status-container.orientation-square .status-photo img {
|
||||
max-height: 601px !important;
|
||||
}
|
||||
|
||||
.card.status-container.orientation-portrait .status-photo img {
|
||||
max-height: 772px !important;
|
||||
}
|
||||
|
||||
.no-caret.dropdown-toggle {
|
||||
text-decoration: none !important;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<footer class="pt-5 mt-5">
|
||||
<div class="container mt-5 pt-5">
|
||||
<p class="mt-5 text-uppercase font-weight-bold small">
|
||||
<footer>
|
||||
<div class="container mt-5">
|
||||
<p class="text-uppercase font-weight-bold small">
|
||||
<a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a>
|
||||
<a href="{{route('site.help')}}" class="text-primary pr-2">Support</a>
|
||||
<a href="" class="text-primary pr-2">API</a>
|
||||
|
@ -14,4 +14,4 @@
|
|||
<a href="#" class="text-dark float-right">© {{date('Y')}} PixelFed.org</a>
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
</footer>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
@include('profile.partial.user-info')
|
||||
|
||||
<div class="container following-page" style="min-height: 60vh;">
|
||||
<div class="col-12 col-md-8 offset-2">
|
||||
<div class="col-12 col-md-8 offset-md-2">
|
||||
@if($followers->count() !== 0)
|
||||
<ul class="list-group mt-4">
|
||||
@foreach($followers as $user)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
@include('profile.partial.user-info')
|
||||
|
||||
<div class="container following-page" style="min-height: 60vh;">
|
||||
<div class="col-12 col-md-8 offset-2">
|
||||
<div class="col-12 col-md-8 offset-md-2">
|
||||
@if($following->count() !== 0)
|
||||
<ul class="list-group mt-4">
|
||||
@foreach($following as $user)
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="timestamp mb-0">
|
||||
<p class="small text-uppercase mb-0"><a href="{{$status->url()}}" class="text-muted">{{$status->created_at->diffForHumans()}}</a></p>
|
||||
<p class="small text-uppercase mb-0"><a href="{{$status->url()}}" class="text-muted">{{$status->created_at->diffForHumans(null, true, true, true)}}</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body status-comments">
|
||||
|
@ -65,7 +65,7 @@
|
|||
</span>
|
||||
</div>
|
||||
<div class="likes font-weight-bold mb-0">
|
||||
<span class="like-count">{{$status->likes()->count()}}</span> likes
|
||||
<span class="like-count">{{$status->likes_count}}</span> likes
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
|
|
Loading…
Reference in a new issue