Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

icons: Replace fa fa-ban-deactivated-user-icon with zulip-icon-deactivated-circle.

sandeepfb0ab90f602c
diff --git a/web/styles/input_pill.css b/web/styles/input_pill.css
index ce7869de3e7..bc46f50995a 100644
--- a/web/styles/input_pill.css
+++ b/web/styles/input_pill.css
@@ -175,11 +175,11 @@
.slashed-circle-icon {
position: absolute;
background-color: var(--color-background-deactivated-user-pill);
- padding: 0.2em;
- font-size: 0.7em;
- border-radius: 0.625em;
+ padding: 0.3em 0.22em 0.22em;
+ font-size: 0.6em;
+ border-radius: 0.925em;
bottom: -0.0625em;
- left: 1.1em;
+ left: 1.3em;
opacity: 1;
}
diff --git a/web/styles/modal.css b/web/styles/modal.css
index 726c3f6591b..a82ddb25d46 100644
--- a/web/styles/modal.css
+++ b/web/styles/modal.css
@@ -360,7 +360,7 @@
.deactivated-user-icon {
vertical-align: middle;
- font-size: 0.7em;
+ font-size: 0.6em;
}
#default-section {
diff --git a/web/styles/popovers.css b/web/styles/popovers.css
index e8fe6d607b5..38f4f65ab4a 100644
--- a/web/styles/popovers.css
+++ b/web/styles/popovers.css
@@ -872,9 +872,9 @@ ul.popover-group-menu-member-list {
border-radius: 50%;
&.deactivated-user-icon {
- font-size: 0.8em;
+ font-size: 0.69em;
background-color: var(--color-background-popover-menu);
- padding: 1px;
+ padding: 1.5px;
}
}
diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.css
index 14ecae8248d..73615647350 100644
--- a/web/styles/subscriptions.css
+++ b/web/styles/subscriptions.css
@@ -863,8 +863,7 @@
width: 100%;
}
-.left .group-name-wrapper .fa-ban,
-.right .group-name .fa-ban {
+.left .group-name-wrapper .deactivated-user-icon {
font-size: 0.8em;
opacity: 0.6;
}
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index 2a68e71c252..2fa0af93b1e 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -1579,7 +1579,7 @@ div.topic_edit_spinner .loading_indicator_spinner {
.deactivated_user .deactivated-user-icon {
color: inherit;
margin-left: 2px;
- font-size: 0.9em;
+ font-size: 0.78em;
}
.no-drag {
@@ -2650,11 +2650,11 @@ body:not(.spectator-view) {
.deactivated-user-icon {
background-color: var(--color-background);
color: var(--color-user-circle-deactivated);
- padding: 2px;
- font-size: 0.8em;
+ padding: 2.4px;
+ font-size: 0.69em;
position: absolute;
border-radius: 10px;
- bottom: -2px;
+ bottom: -1px;
right: -2px;
}
}
diff --git a/web/templates/input_pill.hbs b/web/templates/input_pill.hbs
index e8a154a2544..e8916c36ae0 100644
--- a/web/templates/input_pill.hbs
+++ b/web/templates/input_pill.hbs
@@ -7,7 +7,7 @@
<img class="pill-image" src="{{img_src}}" />
<div class="pill-image-border"></div>
{{#if deactivated}}
- <span class="fa fa-ban slashed-circle-icon"></span>
+ <span class="zulip-icon zulip-icon-deactivated-circle slashed-circle-icon"></span>
{{/if}}
{{/if}}
<span class="pill-label">
diff --git a/web/templates/message_avatar.hbs b/web/templates/message_avatar.hbs
index 8667f8ba256..c32b46eca4e 100644
--- a/web/templates/message_avatar.hbs
+++ b/web/templates/message_avatar.hbs
@@ -3,7 +3,7 @@
<div class="inline_profile_picture {{#if sender_is_guest}} guest-avatar{{/if}} {{#if sender_is_deactivated}} deactivated {{/if}} {{#if is_hidden}} muted-sender-avatar {{/if}}">
<img loading="lazy" src="{{small_avatar_url}}" alt="" class="no-drag"/>
{{#if sender_is_deactivated}}
- <i class="fa fa-ban deactivated-user-icon"></i>
+ <i class="zulip-icon zulip-icon-deactivated-circle deactivated-user-icon"></i>
{{/if}}
</div>
</div>
diff --git a/web/templates/popovers/user_card/user_card_popover.hbs b/web/templates/popovers/user_card/user_card_popover.hbs
index a75893208fb..d40d29c01fb 100644
--- a/web/templates/popovers/user_card/user_card_popover.hbs
+++ b/web/templates/popovers/user_card/user_card_popover.hbs
@@ -6,7 +6,7 @@
<div class="popover-menu-user-presence user-circle zulip-icon zulip-icon-{{user_circle_class}} {{user_circle_class}} hidden-for-spectators" data-presence-indicator-user-id="{{user_id}}"></div>
{{/if}}
{{#if (not is_active)}}
- <span class="popover-menu-user-presence conversation-partners-icon fa fa-ban fa-lg deactivated-user-icon user_circle"></span>
+ <span class="popover-menu-user-presence conversation-partners-icon zulip-icon zulip-icon-deactivated-circle deactivated-user-icon user_circle"></span>
{{/if}}
</div>
<div class="popover-menu-user-info">
diff --git a/web/templates/search_user_pill.hbs b/web/templates/search_user_pill.hbs
index f54c4706644..1c8f94fb86c 100644
--- a/web/templates/search_user_pill.hbs
+++ b/web/templates/search_user_pill.hbs
@@ -8,7 +8,7 @@
<img class="pill-image" src="{{this.img_src}}" />
<div class="pill-image-border"></div>
{{#if deactivated}}
- <span class="fa fa-ban slashed-circle-icon"></span>
+ <span class="zulip-icon zulip-icon-deactivated-circle slashed-circle-icon"></span>
{{/if}}
<span class="pill-label">
<span class="pill-value">{{ this.full_name }}</span>
diff --git a/web/templates/user_display_only_pill.hbs b/web/templates/user_display_only_pill.hbs
index 76d1f6fcbb7..3df77491180 100644
--- a/web/templates/user_display_only_pill.hbs
+++ b/web/templates/user_display_only_pill.hbs
@@ -16,7 +16,7 @@
<i class="zulip-icon zulip-icon-bot" aria-label="{{t 'Bot' }}"></i>
{{/if}}
{{#unless is_active}}
- <i class="fa fa-ban pill-deactivated deactivated-user-icon tippy-zulip-delayed-tooltip" data-tippy-content="{{#if is_bot}}{{t 'Bot is deactivated' }}{{else}}{{t 'User is deactivated' }}{{/if}}"></i>
+ <i class="zulip-icon zulip-icon-deactivated-circle pill-deactivated deactivated-user-icon tippy-zulip-delayed-tooltip" data-tippy-content="{{#if is_bot}}{{t 'Bot is deactivated' }}{{else}}{{t 'User is deactivated' }}{{/if}}"></i>
{{/unless}}
</span>
</a>
diff --git a/web/templates/user_group_settings/browse_user_groups_list_item.hbs b/web/templates/user_group_settings/browse_user_groups_list_item.hbs
index 6c072269b39..0d0c78cc3ad 100644
--- a/web/templates/user_group_settings/browse_user_groups_list_item.hbs
+++ b/web/templates/user_group_settings/browse_user_groups_list_item.hbs
@@ -78,7 +78,7 @@
<div class="group-name-wrapper">
<div class="group-name">{{name}}</div>
{{#if deactivated}}
- <i class="fa fa-ban deactivated-user-icon"></i>
+ <i class="zulip-icon zulip-icon-deactivated-circle deactivated-user-icon"></i>
{{/if}}
</div>
</div>
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 58c90c9a927..e62aee4c9ab 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -12,9 +12,9 @@
{{else}}
<span>
{{#if is_deleted}}
- <i class="fa fa-ban deactivated-user-icon tippy-zulip-tooltip" data-tippy-content="{{t 'Deleted user'}}"></i>
+ <i class="zulip-icon zulip-icon-deactivated-circle deactivated-user-icon tippy-zulip-tooltip" data-tippy-content="{{t 'Deleted user'}}"></i>
{{else}}
- <i class="fa fa-ban deactivated-user-icon tippy-zulip-tooltip" data-tippy-content="{{t 'Deactivated user'}}"></i>
+ <i class="zulip-icon zulip-icon-deactivated-circle deactivated-user-icon tippy-zulip-tooltip" data-tippy-content="{{t 'Deactivated user'}}"></i>
{{/if}}
</span>
{{/if}}