From 7340ea64b9e6b74eb1dfcc9d9cbeac926d821217 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Fri, 21 Jul 2023 21:58:49 +0200 Subject: [PATCH] Update group notification icons --- images/icons/v2/member-accepted-16.svg | 1 - images/icons/v2/member-accepted-solid-16.svg | 1 - images/icons/v2/member-added-16.svg | 1 - images/icons/v2/member-added-solid-16.svg | 1 - images/icons/v2/member-declined-16.svg | 1 - images/icons/v2/member-declined-solid-16.svg | 1 - images/icons/v2/member-remove-16.svg | 1 - images/icons/v2/member-remove-solid-16.svg | 1 - .../icons/v3/person/person-check-compact.svg | 1 + .../icons/v3/person/person-minus-compact.svg | 1 + .../icons/v3/person/person-plus-compact.svg | 1 + images/icons/v3/person/person-x-compact.svg | 1 + stylesheets/components/SystemMessage.scss | 65 ++++--------------- 13 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 images/icons/v2/member-accepted-16.svg delete mode 100644 images/icons/v2/member-accepted-solid-16.svg delete mode 100644 images/icons/v2/member-added-16.svg delete mode 100644 images/icons/v2/member-added-solid-16.svg delete mode 100644 images/icons/v2/member-declined-16.svg delete mode 100644 images/icons/v2/member-declined-solid-16.svg delete mode 100644 images/icons/v2/member-remove-16.svg delete mode 100644 images/icons/v2/member-remove-solid-16.svg create mode 100644 images/icons/v3/person/person-check-compact.svg create mode 100644 images/icons/v3/person/person-minus-compact.svg create mode 100644 images/icons/v3/person/person-plus-compact.svg create mode 100644 images/icons/v3/person/person-x-compact.svg diff --git a/images/icons/v2/member-accepted-16.svg b/images/icons/v2/member-accepted-16.svg deleted file mode 100644 index 46999512d9ef..000000000000 --- a/images/icons/v2/member-accepted-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-accepted-solid-16.svg b/images/icons/v2/member-accepted-solid-16.svg deleted file mode 100644 index 1e3b18db8e4b..000000000000 --- a/images/icons/v2/member-accepted-solid-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-added-16.svg b/images/icons/v2/member-added-16.svg deleted file mode 100644 index 4ab881445e63..000000000000 --- a/images/icons/v2/member-added-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-added-solid-16.svg b/images/icons/v2/member-added-solid-16.svg deleted file mode 100644 index f2245117f862..000000000000 --- a/images/icons/v2/member-added-solid-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-declined-16.svg b/images/icons/v2/member-declined-16.svg deleted file mode 100644 index a2f25c85269b..000000000000 --- a/images/icons/v2/member-declined-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-declined-solid-16.svg b/images/icons/v2/member-declined-solid-16.svg deleted file mode 100644 index 11957627dfde..000000000000 --- a/images/icons/v2/member-declined-solid-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-remove-16.svg b/images/icons/v2/member-remove-16.svg deleted file mode 100644 index e96eecb26cb5..000000000000 --- a/images/icons/v2/member-remove-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v2/member-remove-solid-16.svg b/images/icons/v2/member-remove-solid-16.svg deleted file mode 100644 index 5859fe4a0da4..000000000000 --- a/images/icons/v2/member-remove-solid-16.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/icons/v3/person/person-check-compact.svg b/images/icons/v3/person/person-check-compact.svg new file mode 100644 index 000000000000..e1e29a67b60c --- /dev/null +++ b/images/icons/v3/person/person-check-compact.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/icons/v3/person/person-minus-compact.svg b/images/icons/v3/person/person-minus-compact.svg new file mode 100644 index 000000000000..7bbe72f1fa40 --- /dev/null +++ b/images/icons/v3/person/person-minus-compact.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/icons/v3/person/person-plus-compact.svg b/images/icons/v3/person/person-plus-compact.svg new file mode 100644 index 000000000000..b5ae0a1b5355 --- /dev/null +++ b/images/icons/v3/person/person-plus-compact.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/icons/v3/person/person-x-compact.svg b/images/icons/v3/person/person-x-compact.svg new file mode 100644 index 000000000000..b9cbf1b6b4a9 --- /dev/null +++ b/images/icons/v3/person/person-x-compact.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/stylesheets/components/SystemMessage.scss b/stylesheets/components/SystemMessage.scss index 875d04461810..c3bd2300e082 100644 --- a/stylesheets/components/SystemMessage.scss +++ b/stylesheets/components/SystemMessage.scss @@ -1,13 +1,13 @@ // Copyright 2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -@mixin system-message-icon($light, $dark) { +@mixin system-message-icon($url) { @include light-theme { - -webkit-mask: url($light) no-repeat center; + -webkit-mask: url($url) no-repeat center; -webkit-mask-size: 100%; } @include dark-theme { - -webkit-mask: url($dark) no-repeat center; + -webkit-mask: url($url) no-repeat center; -webkit-mask-size: 100%; } } @@ -68,217 +68,176 @@ &--icon-audio-incoming::before { @include system-message-icon( - '../images/icons/v3/phone/phone-compact.svg', '../images/icons/v3/phone/phone-compact.svg' ); } &--icon-audio-missed::before { @include system-message-icon( - '../images/icons/v3/phone/phone-compact.svg', '../images/icons/v3/phone/phone-compact.svg' ); } &--icon-audio-outgoing::before { @include system-message-icon( - '../images/icons/v3/phone/phone-compact.svg', '../images/icons/v3/phone/phone-compact.svg' ); } &--icon-group::before { @include system-message-icon( - '../images/icons/v3/group/group-compact.svg', '../images/icons/v3/group/group-compact.svg' ); } &--icon-group-access::before { @include system-message-icon( - '../images/icons/v3/megaphone/megaphone-compact.svg', '../images/icons/v3/megaphone/megaphone-compact.svg' ); } &--icon-group-add::before { @include system-message-icon( - '../images/icons/v2/member-added-16.svg', - '../images/icons/v2/member-added-solid-16.svg' + '../images/icons/v3/person/person-plus-compact.svg' ); } &--icon-group-approved::before { @include system-message-icon( - '../images/icons/v2/member-accepted-16.svg', - '../images/icons/v2/member-accepted-solid-16.svg' + '../images/icons/v3/person/person-check-compact.svg' ); } &--icon-group-avatar::before { @include system-message-icon( - '../images/icons/v3/photo/photo-square-compact.svg', '../images/icons/v3/photo/photo-square-compact.svg' ); } &--icon-group-decline::before { @include system-message-icon( - '../images/icons/v2/member-declined-16.svg', - '../images/icons/v2/member-declined-solid-16.svg' + '../images/icons/v3/person/person-x-compact.svg' ); } &--icon-group-edit::before { - @include system-message-icon( - '../images/icons/v3/edit/edit-compact.svg', - '../images/icons/v3/edit/edit-compact.svg' - ); + @include system-message-icon('../images/icons/v3/edit/edit-compact.svg'); } &--icon-group-leave::before { @include system-message-icon( - '../images/icons/v3/leave/leave-compact.svg', '../images/icons/v3/leave/leave-compact.svg' ); } &--icon-group-remove::before { @include system-message-icon( - '../images/icons/v2/member-remove-16.svg', - '../images/icons/v2/member-remove-solid-16.svg' + '../images/icons/v3/person/person-minus-compact.svg' ); } &--icon-group-summary::before { - @include system-message-icon( - '../images/icons/v3/info/info-compact.svg', - '../images/icons/v3/info/info-compact.svg' - ); + @include system-message-icon('../images/icons/v3/info/info-compact.svg'); } &--icon-info::before { - @include system-message-icon( - '../images/icons/v3/info/info-compact.svg', - '../images/icons/v3/info/info-compact.svg' - ); + @include system-message-icon('../images/icons/v3/info/info-compact.svg'); } &--icon-phone::before { @include system-message-icon( - '../images/icons/v3/phone/phone-compact.svg', '../images/icons/v3/phone/phone-compact.svg' ); } &--icon-profile::before { @include system-message-icon( - '../images/icons/v3/person/person-compact.svg', '../images/icons/v3/person/person-compact.svg' ); } &--icon-safety-number::before { @include system-message-icon( - '../images/icons/v3/safety_number/safety_number-compact.svg', '../images/icons/v3/safety_number/safety_number-compact.svg' ); } &--icon-session-refresh::before { - @include system-message-icon( - '../images/icons/v3/refresh/refresh.svg', - '../images/icons/v3/refresh/refresh.svg' - ); + @include system-message-icon('../images/icons/v3/refresh/refresh.svg'); } &--icon-timer::before { @include system-message-icon( - '../images/icons/v3/timer/timer-compact.svg', '../images/icons/v3/timer/timer-compact.svg' ); } &--icon-timer-disabled::before { @include system-message-icon( - '../images/icons/v3/timer/timer-slash-compact.svg', '../images/icons/v3/timer/timer-slash-compact.svg' ); } &--icon-unsupported::before { @include system-message-icon( - '../images/icons/v3/error/error-circle-compact.svg', '../images/icons/v3/error/error-circle-compact.svg' ); } &--icon-unsupported--can-process::before { @include system-message-icon( - '../images/icons/v3/check/check-circle-compact.svg', '../images/icons/v3/check/check-circle-compact.svg' ); } &--icon-verified::before { @include system-message-icon( - '../images/icons/v3/check/check-compact.svg', '../images/icons/v3/check/check-compact.svg' ); } &--icon-verified-not::before { @include system-message-icon( - '../images/icons/v3/safety_number/safety_number-compact.svg', '../images/icons/v3/safety_number/safety_number-compact.svg' ); } &--icon-video::before { @include system-message-icon( - '../images/icons/v3/video/video-compact.svg', '../images/icons/v3/video/video-compact.svg' ); } &--icon-video-incoming::before { @include system-message-icon( - '../images/icons/v3/video/video-compact.svg', '../images/icons/v3/video/video-compact.svg' ); } &--icon-video-missed::before { @include system-message-icon( - '../images/icons/v3/video/video-compact.svg', '../images/icons/v3/video/video-compact.svg' ); } &--icon-video-outgoing::before { @include system-message-icon( - '../images/icons/v3/video/video-compact.svg', '../images/icons/v3/video/video-compact.svg' ); } &--icon-warning::before { @include system-message-icon( - '../images/icons/v3/error/error-circle-compact.svg', '../images/icons/v3/error/error-circle-compact.svg' ); } &--icon-payment-event::before { - @include system-message-icon( - '../images/icons/v3/payment/payment.svg', - '../images/icons/v3/payment/payment.svg' - ); + @include system-message-icon('../images/icons/v3/payment/payment.svg'); } &--icon-merge::before { @include system-message-icon( - '../images/icons/v3/merge/merge-compact.svg', '../images/icons/v3/merge/merge-compact.svg' ); }