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 FontAwesome icons with Zulip icons in settings.

sandeepc6d93d85d86b
diff --git a/web/styles/settings.css b/web/styles/settings.css
index c04788456ed..7a2b15d1b6a 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -2,18 +2,6 @@ label {
margin: 0;
}
-label,
-.settings-subsection-title,
-.settings-table-title,
-/* We need settings-section-title here because some legacy settings
- widgets use a <div> with this class for their heading. */
-.settings-section-title {
- .fa-info-circle {
- top: 1px;
- position: relative;
- }
-}
-
/* Shared font for the subsection and table/list-panel headings across the
settings, channel, and group settings overlays. */
.settings-subsection-title,
@@ -38,8 +26,12 @@ label,
/* TODO: This should ideally be added to help_link_widget.hbs,
allowing us to deduplicate at least the opacity CSS with the
zulip-icon-help logic above. */
-.settings-info-icon {
- padding-left: 3px;
+/* 'i' matches 'i.zulip-icon' specificity, which sets font-size. */
+i.settings-info-icon {
+ /* Eyeballed to sit on the baseline of the label or heading. */
+ font-size: 0.91em;
+ vertical-align: -0.19em;
+ padding-left: 2px;
opacity: 0.7;
&:hover {
@@ -205,7 +197,7 @@ a.help_link_widget {
.play_notification_sound {
.notification-sound-icon {
- font-size: 1.5714em; /* 22px at 14px / em */
+ font-size: 1.4857em; /* 20.8px at 14px / em */
/* Visually center with chevron in select
by setting the line-height equal to the height
of select which is equal to - 1.4em + 8px (4px
@@ -213,6 +205,7 @@ a.help_link_widget {
for top and bottom borders). */
line-height: calc(1.4 * var(--base-font-size-px) + 10px);
cursor: pointer;
+ vertical-align: middle;
}
}
@@ -1024,15 +1017,15 @@ input[type="checkbox"] {
.admin_channel_folders_table {
.movable-row {
.move-handle {
+ vertical-align: middle;
cursor: move;
user-select: none;
margin-right: 5px;
}
- .fa-ellipsis-v {
+ .zulip-icon-grip-vertical {
color: hsl(0deg 0% 75%);
- position: relative;
- top: 1px;
+ vertical-align: -0.1em;
}
}
}
diff --git a/web/templates/settings/admin_channel_folder_list_item.hbs b/web/templates/settings/admin_channel_folder_list_item.hbs
index 044c6937550..48590aea4b7 100644
--- a/web/templates/settings/admin_channel_folder_list_item.hbs
+++ b/web/templates/settings/admin_channel_folder_list_item.hbs
@@ -2,8 +2,7 @@
<td>
{{#if is_admin}}
<span class="move-handle">
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+ <i class="zulip-icon zulip-icon-grip-vertical" aria-hidden="true"></i>
</span>
{{/if}}
<span class="channel-folder-name">{{folder_name}}</span>
diff --git a/web/templates/settings/admin_linkifier_list.hbs b/web/templates/settings/admin_linkifier_list.hbs
index 973f34bee4e..5485fec07a7 100644
--- a/web/templates/settings/admin_linkifier_list.hbs
+++ b/web/templates/settings/admin_linkifier_list.hbs
@@ -3,8 +3,7 @@
<td>
{{#if (and ../can_modify ../can_drag)}}
<span class="move-handle">
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+ <i class="zulip-icon zulip-icon-grip-vertical" aria-hidden="true"></i>
</span>
{{/if}}
<span class="linkifier_example_input rendered_markdown">{{{rendered_example_input_html}}}</span>
diff --git a/web/templates/settings/admin_profile_field_list.hbs b/web/templates/settings/admin_profile_field_list.hbs
index 6fb78462984..148e3660d28 100644
--- a/web/templates/settings/admin_profile_field_list.hbs
+++ b/web/templates/settings/admin_profile_field_list.hbs
@@ -3,8 +3,7 @@
<td class="profile_field_name">
{{#if ../can_modify}}
<span class="move-handle">
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+ <i class="zulip-icon zulip-icon-grip-vertical" aria-hidden="true"></i>
</span>
{{/if}}
<span class="profile_field_name">{{name}}</span>
diff --git a/web/templates/settings/notification_settings.hbs b/web/templates/settings/notification_settings.hbs
index e6bdbfc5d7a..07c0e2a6209 100644
--- a/web/templates/settings/notification_settings.hbs
+++ b/web/templates/settings/notification_settings.hbs
@@ -21,7 +21,7 @@
</th>
<th rowspan="2" width="14%">{{t "Email"}}</th>
<th rowspan="2" width="14%">@all
- <i class="fa fa-question-circle settings-info-icon tippy-zulip-tooltip" data-tippy-content="{{t 'Whether wildcard mentions like @all are treated as mentions for the purpose of notifications.' }}"></i>
+ <i class="zulip-icon zulip-icon-help settings-info-icon tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Whether wildcard mentions like @all are treated as mentions for the purpose of notifications.' }}"></i>
</th>
</tr>
<tr>
@@ -186,7 +186,7 @@
{{/each}}
</select>
<span class="play_notification_sound">
- <i class="notification-sound-icon fa fa-play-circle" aria-label="{{t 'Play sound' }}"></i>
+ <i class="notification-sound-icon zulip-icon zulip-icon-play-circle" aria-label="{{t 'Play sound' }}"></i>
</span>
</div>
</div>
diff --git a/web/templates/settings/organization_permissions_admin.hbs b/web/templates/settings/organization_permissions_admin.hbs
index 49e07ea0395..39c6a147d64 100644
--- a/web/templates/settings/organization_permissions_admin.hbs
+++ b/web/templates/settings/organization_permissions_admin.hbs
@@ -5,7 +5,7 @@
<div class="subsection-header">
<h3 class="settings-subsection-title">
{{t "Joining the organization" }}
- <i class="fa fa-info-circle settings-info-icon tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Only owners can change these settings.' }}"></i>
+ <i class="zulip-icon zulip-icon-info settings-info-icon tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Only owners can change these settings.' }}"></i>
</h3>
{{> settings_save_discard_widget section_name="join-settings" show_save_discard_buttons=true }}
</div>
diff --git a/web/templates/settings/profile_field_choice.hbs b/web/templates/settings/profile_field_choice.hbs
index 7f3186bebc5..e92f3673a25 100644
--- a/web/templates/settings/profile_field_choice.hbs
+++ b/web/templates/settings/profile_field_choice.hbs
@@ -1,7 +1,6 @@
<div class='choice-row movable-row' data-value="{{value}}">
<span class="move-handle {{#if new_empty_choice_row}}invisible{{/if}}">
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+ <i class="zulip-icon zulip-icon-grip-vertical" aria-hidden="true"></i>
</span>
<input type='text' class="modal_text_input" placeholder='{{t "New option" }}' value="{{ text }}" {{#if is_existing_choice}}disabled{{/if}} />
{{#if is_existing_choice}}
diff --git a/web/templates/settings/settings_checkbox.hbs b/web/templates/settings/settings_checkbox.hbs
index 68db8ca5c54..a63f6b97de3 100644
--- a/web/templates/settings/settings_checkbox.hbs
+++ b/web/templates/settings/settings_checkbox.hbs
@@ -14,7 +14,7 @@
{{> ../help_link_widget link=help_link }}
{{/if}}
{{#if help_icon_tooltip_text}}
- <i class="tippy-zulip-tooltip fa fa-info-circle settings-info-icon" {{#if hide_tooltip}}style="display: none;"{{/if}} data-tippy-content="{{help_icon_tooltip_text}}"></i>
+ <i class="tippy-zulip-tooltip zulip-icon zulip-icon-info settings-info-icon" aria-hidden="true" {{#if hide_tooltip}}style="display: none;"{{/if}} data-tippy-content="{{help_icon_tooltip_text}}"></i>
{{/if}}
{{#if show_reset_button}}
{{> ../components/icon_button icon="reset" intent="neutral" custom_classes="reset-user-setting-to-default" data-tippy-content=(t "Reset users to default") aria-label=(t "Reset users to default") }}
diff --git a/web/templates/settings/settings_numeric_input.hbs b/web/templates/settings/settings_numeric_input.hbs
index 40f7824cd5d..0b54253c3bf 100644
--- a/web/templates/settings/settings_numeric_input.hbs
+++ b/web/templates/settings/settings_numeric_input.hbs
@@ -9,7 +9,7 @@
{{> ../help_link_widget link=help_link }}
{{/if}}
{{#if help_icon_tooltip_text}}
- <i class="tippy-zulip-tooltip fa fa-info-circle settings-info-icon" {{#if hide_tooltip}}style="display: none;"{{/if}} data-tippy-content="{{help_icon_tooltip_text}}"></i>
+ <i class="tippy-zulip-tooltip zulip-icon zulip-icon-info settings-info-icon" aria-hidden="true" {{#if hide_tooltip}}style="display: none;"{{/if}} data-tippy-content="{{help_icon_tooltip_text}}"></i>
{{/if}}
</label>
<input type="text" inputmode="numeric" pattern="\d*" value="{{setting_value}}" class="{{setting_name}} settings_text_input setting-widget prop-element" name="{{setting_name}}" data-setting-widget-type="number"