Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
icons: Replace FontAwesome icons with Zulip icons in stream/message UI.
sandeep99fedfb33388
diff --git a/web/src/stream_settings_ui.ts b/web/src/stream_settings_ui.tsindex 805fb61e50e..70ef20bac21 100644--- a/web/src/stream_settings_ui.ts+++ b/web/src/stream_settings_ui.ts@@ -959,14 +959,14 @@ function setup_page(callback: () => void): void {},{label_html: render_stream_sorter_toggle_label({- icon_class: "fa fa-user-o",+ icon_class: "zulip-icon zulip-icon-user",tooltip: $t({defaultMessage: "Sort by number of subscribers"}),}),key: "by-subscriber-count",},{label_html: render_stream_sorter_toggle_label({- icon_class: "fa fa-bar-chart",+ icon_class: "zulip-icon zulip-icon-bar-chart",tooltip: $t({defaultMessage: "Sort by estimated weekly traffic"}),}),key: "by-weekly-traffic",diff --git a/web/styles/message_view_header.css b/web/styles/message_view_header.cssindex e43f3479c23..5cf92e1d164 100644--- a/web/styles/message_view_header.css+++ b/web/styles/message_view_header.css@@ -103,23 +103,21 @@margin: 0;.help_link_widget,- .fa {+ .zulip-icon {margin: 0;}- .fa-question-circle-o {- /* Override relative position for sake of- Chrome paint bug that keeps the circle- visible when ellipses are showing. */- position: static;+ .zulip-icon-help {+ /* Eyeballed to sit on the description's baseline. */+ font-size: 0.88em;+ vertical-align: -0.1em;}.help_link_widget {- /* With relative positioning no longer- in effect, we vertically align the- help icon with an inline-block assist,- which is present on the .fa class. */+ /* Align the icon against the description text. */vertical-align: middle;+ /* Unlike .fa, .zulip-icon inherits the link's underline. */+ text-decoration: none;}}diff --git a/web/styles/modal.css b/web/styles/modal.cssindex a82ddb25d46..924784290d9 100644--- a/web/styles/modal.css+++ b/web/styles/modal.css@@ -138,7 +138,7 @@padding: 0.25em; /* 4px at 16px/1em */}- /* help_link_widget margin for the fa-circle-o. */+ /* help_link_widget margin for the zulip-icon-help. */.help_link_widget {margin-left: 5px;}diff --git a/web/styles/recent_view.css b/web/styles/recent_view.cssindex c9de900d5fb..d8263e08e83 100644--- a/web/styles/recent_view.css+++ b/web/styles/recent_view.css@@ -467,7 +467,7 @@padding-right: 0;}- .fa-user {+ .zulip-icon-user {opacity: 0.7;}}diff --git a/web/styles/settings.css b/web/styles/settings.cssindex 0e5328d77d0..c04788456ed 100644--- a/web/styles/settings.css+++ b/web/styles/settings.css@@ -37,7 +37,7 @@ label,/* TODO: This should ideally be added to help_link_widget.hbs,allowing us to deduplicate at least the opacity CSS with the- fa-question-circle-o logic above. */+ zulip-icon-help logic above. */.settings-info-icon {padding-left: 3px;opacity: 0.7;@@ -52,9 +52,10 @@ a.help_link_widget {color: inherit;margin-left: 3px;- .fa-question-circle-o {- position: relative;- top: 1px;+ .zulip-icon-help {+ /* Eyeballed to sit on the text baseline. */+ font-size: 0.88em;+ vertical-align: -0.16em;}&:hover {diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.cssindex 73615647350..cbc832f6041 100644--- a/web/styles/subscriptions.css+++ b/web/styles/subscriptions.css@@ -445,6 +445,11 @@.tab-switcher.stream_sorter_toggle {margin-left: auto;++ .zulip-icon-bar-chart {+ /* Eyeballed to match the other sort icons. */+ font-size: 1.1em;+ }}.tab-switcher,@@ -1075,6 +1080,19 @@.bottom-bar .stream-message-count {white-space: nowrap;color: hsl(0deg 0% 67%);+ /* Center the icon against its count, rather than nudging it. */+ display: flex;+ align-items: center;+ gap: 0.1em;+ }++ /* Eyeballed to match the count text; glyph sizes vary. */+ .top-bar .subscriber-count .zulip-icon-user {+ font-size: 1.1em;+ }++ .bottom-bar .stream-message-count .zulip-icon-bar-chart {+ font-size: 1.2em;}.top-bar .subscriber-count-text,@@ -1083,6 +1101,10 @@margin-right: 0.3125em; /* 5px at 16px font size */}+ .top-bar .subscriber-count-text {+ margin-left: 0.156em; /* 2.5px at 16px font size */+ }+.top-bar .stream-name {font-weight: 600;}diff --git a/web/styles/zulip.css b/web/styles/zulip.cssindex 2fa0af93b1e..732a7fce297 100644--- a/web/styles/zulip.css+++ b/web/styles/zulip.css@@ -235,6 +235,11 @@ p.n-margin {the message column; the fixed sidebars paint over anything thatspills past its edges. */margin-inline: 2px;++ .zulip-icon-exclamation-circle {+ /* Eyeballed to center the icon against the text. */+ vertical-align: -0.15em;+ }}.messages-logo-svg {diff --git a/web/templates/help_link_widget.hbs b/web/templates/help_link_widget.hbsindex 10e9a8e1ee2..205397c7d53 100644--- a/web/templates/help_link_widget.hbs+++ b/web/templates/help_link_widget.hbs@@ -1,3 +1,3 @@<a class="help_link_widget" href="{{ link }}" target="_blank" rel="noopener noreferrer">- <i class="fa fa-question-circle-o" aria-hidden="true"></i>+ <i class="zulip-icon zulip-icon-help" aria-hidden="true"></i></a>diff --git a/web/templates/message_feed_errors.hbs b/web/templates/message_feed_errors.hbsindex 52efa30aa6d..29de0af5c19 100644--- a/web/templates/message_feed_errors.hbs+++ b/web/templates/message_feed_errors.hbs@@ -1,6 +1,6 @@<div class="history-limited-box"><p>- <i class="fa fa-exclamation-circle" aria-hidden="true"></i>+ <i class="zulip-icon zulip-icon-exclamation-circle" aria-hidden="true"></i>{{#tr}}Some older messages are unavailable.<z-link>Upgrade your organization</z-link>diff --git a/web/templates/message_view_header.hbs b/web/templates/message_view_header.hbsindex 1bfc749bd1c..24fcd75ac72 100644--- a/web/templates/message_view_header.hbs+++ b/web/templates/message_view_header.hbs@@ -31,7 +31,7 @@<span class="narrow_description rendered_markdown single-line-rendered-markdown">{{description}}{{#if link}}<a class="help_link_widget" href="{{link}}" target="_blank" rel="noopener noreferrer">- <i class="fa fa-question-circle-o" aria-hidden="true"></i>+ <i class="zulip-icon zulip-icon-help" aria-hidden="true"></i></a>{{/if}}</span>diff --git a/web/templates/popovers/user_card/user_card_popover.hbs b/web/templates/popovers/user_card/user_card_popover.hbsindex d40d29c01fb..5e6096839bc 100644--- a/web/templates/popovers/user_card/user_card_popover.hbs+++ b/web/templates/popovers/user_card/user_card_popover.hbs@@ -240,7 +240,7 @@{{#if can_unmute}}<li role="none" class="popover-menu-list-item link-item"><a role="menuitem" class="sidebar-popover-unmute-user popover-menu-link hidden-for-spectators" tabindex="0">- <i class="popover-menu-icon fa fa-eye" aria-hidden="true"></i>+ <i class="popover-menu-icon zulip-icon zulip-icon-eye" aria-hidden="true"></i>{{#if is_bot}}<span class="popover-menu-label">{{t "Unmute this bot" }}</span>{{else}}diff --git a/web/templates/recent_view_row.hbs b/web/templates/recent_view_row.hbsindex d84b5af5860..2aaeb8a1a24 100644--- a/web/templates/recent_view_row.hbs+++ b/web/templates/recent_view_row.hbs@@ -59,7 +59,7 @@{{#each senders}}{{#if this.is_muted}}<li class="recent_view_participant_item participant_profile tippy-zulip-tooltip" data-tippy-content="{{t 'Muted user'}}" data-user-id="{{this.user_id}}">- <span><i class="fa fa-user recent_view_participant_overflow"></i></span>+ <span><i class="zulip-icon zulip-icon-user recent_view_participant_overflow"></i></span></li>{{else}}<li class="recent_view_participant_item participant_profile tippy-zulip-tooltip" data-tippy-content="{{this.full_name}}" data-user-id="{{this.user_id}}">diff --git a/web/templates/stream_settings/browse_streams_list_item.hbs b/web/templates/stream_settings/browse_streams_list_item.hbsindex a54e764f4ee..21e8af480d3 100644--- a/web/templates/stream_settings/browse_streams_list_item.hbs+++ b/web/templates/stream_settings/browse_streams_list_item.hbs@@ -57,7 +57,7 @@<div class="description rendered_markdown" data-no-description="{{t 'No description.'}}">{{rendered_markdown rendered_description}}</div>{{#if is_old_stream}}<div class="stream-message-count tippy-zulip-tooltip" data-tippy-content="{{t 'Estimated messages per week' }}">- <i class="fa fa-bar-chart"></i>+ <i class="zulip-icon zulip-icon-bar-chart" aria-hidden="true"></i><span class="stream-message-count-text">{{stream_weekly_traffic}}</span></div>{{else}}diff --git a/web/templates/stream_settings/subscriber_count.hbs b/web/templates/stream_settings/subscriber_count.hbsindex d5a4c0b432d..c57a6c3d61c 100644--- a/web/templates/stream_settings/subscriber_count.hbs+++ b/web/templates/stream_settings/subscriber_count.hbs@@ -1,4 +1,4 @@-<i class="fa fa-user-o" aria-hidden="true"></i>+<i class="zulip-icon zulip-icon-user" aria-hidden="true"></i>{{#if can_access_subscribers}}<span class="subscriber-count-text">{{numberFormat subscriber_count}}</span>{{else}}