From 824d5f133bd7dd8a907391665460043a49dc109f Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Thu, 25 Jan 2024 09:25:27 +0300
Subject: [PATCH] Fixed Avatar, CombineAvatars (#4438)
Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
.../src/components/Avatar.svelte | 22 ++++++++++++-------
.../src/components/CombineAvatars.svelte | 11 ++++++++++
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/plugins/contact-resources/src/components/Avatar.svelte b/plugins/contact-resources/src/components/Avatar.svelte
index 2e39ded45a..0c4e4e87c3 100644
--- a/plugins/contact-resources/src/components/Avatar.svelte
+++ b/plugins/contact-resources/src/components/Avatar.svelte
@@ -185,10 +185,6 @@
font-size: 0.625rem;
letter-spacing: -0.05em;
}
-
- &.roundedRect {
- border-radius: 0.25rem;
- }
}
.ava-card {
@@ -201,6 +197,14 @@
letter-spacing: -0.05em;
}
}
+ .ava-inline,
+ .ava-tiny,
+ .ava-card {
+ &.roundedRect {
+ border-radius: 0.25rem;
+ }
+ }
+
.ava-x-small {
width: 1.5rem; // 24
height: 1.5rem;
@@ -292,15 +296,17 @@
border-radius: 50%;
}
- &.roundedRect {
+ .roundedRect & {
border-radius: 0.5rem;
- .ava-tiny {
+ &.ava-inline,
+ &.ava-tiny,
+ &.ava-card {
border-radius: 0.25rem;
}
- .ava-x-large,
- .ava-2x-large {
+ &.ava-x-large,
+ &.ava-2x-large {
border-radius: 1rem;
}
}
diff --git a/plugins/contact-resources/src/components/CombineAvatars.svelte b/plugins/contact-resources/src/components/CombineAvatars.svelte
index 2e47e3679a..84de32f572 100644
--- a/plugins/contact-resources/src/components/CombineAvatars.svelte
+++ b/plugins/contact-resources/src/components/CombineAvatars.svelte
@@ -86,6 +86,17 @@
.combine-avatar.small:not(:first-child) {
margin-left: calc(1px - 1rem);
}
+ .combine-avatar.inline,
+ .combine-avatar.tiny,
+ .combine-avatar.card,
+ .combine-avatar.x-small,
+ .combine-avatar.smaller,
+ .combine-avatar.small {
+ &:not(:last-child) {
+ mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Cpath d='M16,24.5v-17c0-3.2,1.8-6.1,4.5-7.5H8C3.6,0,0,3.6,0,8v16c0,4.4,3.6,8,8,8h12.5C17.8,30.6,16,27.7,16,24.5z'/%3E%3C/svg%3E%0A")
+ no-repeat;
+ }
+ }
.combine-avatar.medium:not(:first-child) {
margin-left: calc(1px - (2.25rem / 2));
}