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

Merge pull request #219 from hellcp/patch-15 

Fix squashed avatars and long images in timelines
This commit is contained in:
daniel 2018-06-06 23:40:03 -06:00 committed by GitHub
parent 7a7c87d87d 28535a6416
commit ac3303d8ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,3 +203,26 @@ body, button, input, textarea {
height: .25rem; height: .25rem;
animation: loading-bar 3s linear infinite; animation: loading-bar 3s linear infinite;
} }
.max-hide-overflow {
max-height: 500px;
overflow-y: hidden;
}
@media (min-width: map-get($grid-breakpoints, "xs")) {
.max-hide-overflow {
max-height: 600px!important;
}
}
@media (min-width: map-get($grid-breakpoints, "md")) {
.max-hide-overflow {
max-height: 800px!important;
}
}
@media (min-width: map-get($grid-breakpoints, "xl")) {
.max-hide-overflow {
max-height: 1000px!important;
}
}

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

@ -1,6 +1,6 @@
<div class="card my-4 status-card"> <div class="card my-4 status-card">
<div class="card-header d-inline-flex align-items-center bg-white"> <div class="card-header d-inline-flex align-items-center bg-white">
<img class="img-thumbnail" src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;"> <img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;">
<a class="username font-weight-bold pl-2 text-dark" href="{{$item->profile->url()}}"> <a class="username font-weight-bold pl-2 text-dark" href="{{$item->profile->url()}}">
{{$item->profile->username}} {{$item->profile->username}}
</a> </a>
@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
<a href="{{$item->url()}}"> <a class="max-hide-overflow" href="{{$item->url()}}">
<img class="card-img-top" src="{{$item->mediaUrl()}}"> <img class="card-img-top" src="{{$item->mediaUrl()}}">
</a> </a>
<div class="card-body"> <div class="card-body">
@ -100,4 +100,4 @@
<input class="form-control status-reply-input" name="comment" placeholder="Add a comment..."> <input class="form-control status-reply-input" name="comment" placeholder="Add a comment...">
</form> </form>
</div> </div>
</div> </div>