aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
authorkontrollanten <6680299+kontrollanten@users.noreply.github.com>2022-02-28 08:34:43 +0100
committerGitHub <noreply@github.com>2022-02-28 08:34:43 +0100
commitd0800f7661f13fabe7bb6f4aa0ea50764f106405 (patch)
treed43e6b0b6f4a5a32e03487e6464edbcaf288be2a /client/src/sass
parent5cad2ca9db9b9d138f8a33058d10b94a9fd50c69 (diff)
downloadPeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.gz
PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.zst
PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.zip
Implement avatar miniatures (#4639)
* client: remove unused file * refactor(client/my-actor-avatar): size from input Read size from component input instead of scss, to make it possible to use smaller avatar images when implemented. * implement avatar miniatures close #4560 * fix(test): max file size * fix(search-index): normalize res acc to avatarMini * refactor avatars to an array * client/search: resize channel avatar to 120 * refactor(client/videos): remove unused function * client(actor-avatar): set default size * fix tests and avatars full result When findOne is used only an array containting one avatar is returned. * update migration version and version notations * server/search: harmonize normalizing * Cleanup avatar miniature PR Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/include/_account-channel-page.scss4
-rw-r--r--client/src/sass/include/_actor.scss4
-rw-r--r--client/src/sass/include/_mixins.scss2
3 files changed, 2 insertions, 8 deletions
diff --git a/client/src/sass/include/_account-channel-page.scss b/client/src/sass/include/_account-channel-page.scss
index b135bbb6d..06384b98d 100644
--- a/client/src/sass/include/_account-channel-page.scss
+++ b/client/src/sass/include/_account-channel-page.scss
@@ -26,10 +26,6 @@
26 grid-column: 1; 26 grid-column: 1;
27 margin-bottom: 30px; 27 margin-bottom: 30px;
28 28
29 .main-avatar {
30 @include actor-avatar-size(120px);
31 }
32
33 > div { 29 > div {
34 @include margin-left($img-margin); 30 @include margin-left($img-margin);
35 31
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss
index f9e44b8ad..aa2331efe 100644
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -1,12 +1,10 @@
1@use '_variables' as *; 1@use '_variables' as *;
2@use '_mixins' as *; 2@use '_mixins' as *;
3 3
4@mixin actor-row ($avatar-size: 80px, $avatar-margin-right: 10px, $min-height: 130px, $separator: true) { 4@mixin actor-row ($avatar-margin-right: 10px, $min-height: 130px, $separator: true) {
5 @include row-blocks($min-height: $min-height, $separator: $separator); 5 @include row-blocks($min-height: $min-height, $separator: $separator);
6 6
7 > my-actor-avatar { 7 > my-actor-avatar {
8 @include actor-avatar-size($avatar-size);
9
10 @include margin-right($avatar-margin-right); 8 @include margin-right($avatar-margin-right);
11 } 9 }
12 10
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index c8ec3b4d1..291bff6db 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -887,7 +887,7 @@
887 height: $avatar-height; 887 height: $avatar-height;
888 888
889 my-actor-avatar { 889 my-actor-avatar {
890 @include actor-avatar-size($avatar-height); 890 display: inline-block;
891 } 891 }
892 892
893 div { 893 div {