mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #197 from hellcp/patch-13 

Fixes to look of status view
This commit is contained in:
daniel 2018-06-04 23:00:59 -06:00 committed by GitHub
parent 17bdf9c0be 0fd6316806
commit 70082078d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/assets/sass/custom.scss vendored
View File

@ -71,9 +71,12 @@ body, button, input, textarea {
margin: auto !important;
}
@media (min-width: map-get($grid-breakpoints, "md")) {
.card.status-container .status-comments {
overflow-y:scroll;
border-bottom:1px solid rgba(0, 0, 0, 0.1);
border-bottom:1px solid rgba(0,0,0,.1);
height: 200px;
}
}
.no-caret.dropdown-toggle {
@ -184,3 +187,18 @@ body, button, input, textarea {
.fas.fa-heart {
}
@media (max-width: map-get($grid-breakpoints, "md")) {
.border-md-left-0 {
border-left:0!important
}
.card.status-container .status-comments {
border-top:1px solid rgba(0,0,0,.1);
}
.sticky-md-bottom {
position:-webkit-sticky;
position:sticky;
bottom:0;
z-index:1020
}
}

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

@ -5,11 +5,7 @@
<div class="container px-0 mt-md-4">
<div class="card status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
<div class="row mx-0">
<div class="col-12 col-md-8 status-photo px-0">
<img src="{{$status->mediaUrl()}}" width="100%">
</div>
<div class="col-12 col-md-4 px-0 d-flex flex-column border-left border-md-left-0">
<div class="d-flex align-items-center justify-content-between card-header">
<div class="d-flex d-md-none align-items-center justify-content-between card-header w-100">
<div class="d-flex align-items-center status-username">
<div class="status-avatar mr-2">
<img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
@ -22,6 +18,24 @@
<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="col-12 col-md-8 status-photo px-0">
<img src="{{$status->mediaUrl()}}" width="100%">
</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">
<div class="d-flex align-items-center status-username">
<div class="status-avatar mr-2">
<img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
</div>
<div class="username">
<a href="{{$user->url()}}" class="username-link font-weight-bold text-dark">{{$user->username}}</a>
</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(null, true, true, true)}}</a></p>
</div>
</div>
<div class="d-flex flex-md-column flex-column-reverse h-100">
<div class="card-body status-comments">
<div class="status-comment">
<p class="mb-1">
@ -74,7 +88,8 @@
<span class="like-count" data-count="{{$status->likes_count}}">{{$status->likes_count}}</span> likes
</div>
</div>
<div class="card-footer">
</div>
<div class="card-footer bg-light sticky-md-bottom">
<form class="comment-form" method="post" action="/i/comment" data-id="{{$status->id}}" data-truncate="false">
@csrf
<input type="hidden" name="item" value="{{$status->id}}">