UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #724 from cmho/598-avatar-sizing

Browse source 
[598] Apply content-box box-sizing to avatars images
This commit is contained in:
daniel 2019-01-23 14:05:05 -07:00 committed by GitHub
commit 3a626bad44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/assets/sass/custom.scss vendored
View file

@ -462,3 +462,13 @@ details summary::-webkit-details-marker {
height: auto; height: auto;
} }
} }
.img-thumbnail {
box-sizing: content-box;
}
.reply-container {
.post-thumbnail {
object-fit: cover;
}
}

8
resources/views/status/reply.blade.php
View file

@ -2,12 +2,12 @@
@section('content') @section('content')
<div class="container"> <div class="container reply-container">
<div class="col-12 col-md-8 offset-md-2 mt-4"> <div class="col-12 col-md-8 offset-md-2 mt-4">
<div class="card"> <div class="card">
<div class="card-body p-0 m-0 bg-light"> <div class="card-body p-0 m-0 bg-light">
<div class="d-flex p-0 m-0 align-items-center"> <div class="d-flex p-0 m-0 align-items-center">
<img src="{{$status->parent()->thumb()}}" width="150px" height="150px"> <img src="{{$status->parent()->thumb()}}" width="150px" height="150px" class="post-thumbnail">
<div class="p-4"> <div class="p-4">
<div> <div>
<img src="{{$status->parent()->profile->avatarUrl()}}" class="rounded-circle img-thumbnail mb-1 mr-1" width="30px"> <img src="{{$status->parent()->profile->avatarUrl()}}" class="rounded-circle img-thumbnail mb-1 mr-1" width="30px">
@ -54,6 +54,6 @@
$('.reactions').hide(); $('.reactions').hide();
$('.more-comments').hide(); $('.more-comments').hide();
$('.card-footer').hide(); $('.card-footer').hide();
}); });
</script> </script>
@endpush @endpush