From 5bd37b44f2b77ebe59f712a5d364efcb47ed91a6 Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Thu, 29 Apr 2021 00:13:54 +0000 Subject: [PATCH] zulip-icon: Add `zulip-icon` as classPrefix for icon. This avoids general class names like `bot`. --- static/assets/icons/zulip-icons.font.js | 2 +- static/styles/components.css | 2 +- static/styles/zulip.css | 4 ++-- static/templates/me_message.hbs | 2 +- static/templates/message_body.hbs | 2 +- static/templates/message_controls.hbs | 2 +- static/templates/stream_sidebar_row.hbs | 2 +- static/templates/topic_list_item.hbs | 2 +- static/templates/user_group_info_popover_content.hbs | 2 +- static/templates/user_info_popover_content.hbs | 2 +- static/templates/user_presence_row.hbs | 2 +- templates/zerver/app/left_sidebar.html | 4 ++-- templates/zerver/archive/single_message.html | 4 ++-- templates/zerver/help/delete-a-topic.md | 2 +- templates/zerver/help/emoji-reactions.md | 2 +- templates/zerver/help/include/message-actions-menu.md | 2 +- templates/zerver/help/include/stream-actions.md | 2 +- templates/zerver/help/marking-messages-as-read.md | 2 +- templates/zerver/help/mention-a-user-or-group.md | 2 +- templates/zerver/help/mute-a-topic.md | 4 ++-- templates/zerver/help/status-and-availability.md | 4 ++-- templates/zerver/help/stream-notifications.md | 2 +- templates/zerver/help/view-someones-profile.md | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/static/assets/icons/zulip-icons.font.js b/static/assets/icons/zulip-icons.font.js index 37d01037ba..378083a68d 100644 --- a/static/assets/icons/zulip-icons.font.js +++ b/static/assets/icons/zulip-icons.font.js @@ -5,7 +5,7 @@ module.exports = { files: ["./*.svg"], fontName: "zulip-icons", - classPrefix: "", + classPrefix: "zulip-icon-", baseSelector: ".zulip-icon", cssTemplate: "./template.hbs", ligature: false, diff --git a/static/styles/components.css b/static/styles/components.css index 5a781c3887..52de5fb190 100644 --- a/static/styles/components.css +++ b/static/styles/components.css @@ -106,7 +106,7 @@ a.no-underline:hover { } } -i.zulip-icon.bot { +i.zulip-icon.zulip-icon-bot { color: hsl(180, 5%, 74%); vertical-align: top; padding: 0 2px; diff --git a/static/styles/zulip.css b/static/styles/zulip.css index 631752af9e..5fb7f0b8f5 100644 --- a/static/styles/zulip.css +++ b/static/styles/zulip.css @@ -1251,7 +1251,7 @@ td.pointer { vertical-align: top; position: relative; - i.zulip-icon.bot { + i.zulip-icon.zulip-icon-bot { font-size: 12px; } } @@ -1277,7 +1277,7 @@ td.pointer { } } -.popover_info i.zulip-icon.bot { +.popover_info i.zulip-icon.zulip-icon-bot { margin-top: 3px; } diff --git a/static/templates/me_message.hbs b/static/templates/me_message.hbs index a84bcf4a69..da4cf21d74 100644 --- a/static/templates/me_message.hbs +++ b/static/templates/me_message.hbs @@ -12,7 +12,7 @@ {{#if sender_is_bot}} - + {{/if}} {{rendered_markdown status_message}} diff --git a/static/templates/message_body.hbs b/static/templates/message_body.hbs index 08616a3813..1b87f0e597 100644 --- a/static/templates/message_body.hbs +++ b/static/templates/message_body.hbs @@ -6,7 +6,7 @@ {{> message_avatar}} {{msg/sender_full_name}} {{#if sender_is_bot}} - + {{/if}} {{/if}} diff --git a/static/templates/message_controls.hbs b/static/templates/message_controls.hbs index 1553f33bdc..44216b402c 100644 --- a/static/templates/message_controls.hbs +++ b/static/templates/message_controls.hbs @@ -11,7 +11,7 @@ {{#unless msg/locally_echoed}}
- +
{{/unless}} diff --git a/static/templates/stream_sidebar_row.hbs b/static/templates/stream_sidebar_row.hbs index eec5b2a597..3463d789df 100644 --- a/static/templates/stream_sidebar_row.hbs +++ b/static/templates/stream_sidebar_row.hbs @@ -12,6 +12,6 @@ - + diff --git a/static/templates/topic_list_item.hbs b/static/templates/topic_list_item.hbs index ca6f792b8e..5eebcf2e93 100644 --- a/static/templates/topic_list_item.hbs +++ b/static/templates/topic_list_item.hbs @@ -8,6 +8,6 @@ - + diff --git a/static/templates/user_group_info_popover_content.hbs b/static/templates/user_group_info_popover_content.hbs index 062f800789..c465bff0e9 100644 --- a/static/templates/user_group_info_popover_content.hbs +++ b/static/templates/user_group_info_popover_content.hbs @@ -11,7 +11,7 @@
  • {{#if is_active }} {{#if is_bot}} - + {{else}} {{/if}} diff --git a/static/templates/user_info_popover_content.hbs b/static/templates/user_info_popover_content.hbs index 1d2938ad2a..b02a9b4ca7 100644 --- a/static/templates/user_info_popover_content.hbs +++ b/static/templates/user_info_popover_content.hbs @@ -5,7 +5,7 @@ {{user_full_name}} {{#if is_active }} {{#if is_bot}} - + {{else}} {{/if}} diff --git a/static/templates/user_presence_row.hbs b/static/templates/user_presence_row.hbs index b23deec9b0..1d37cc3d16 100644 --- a/static/templates/user_presence_row.hbs +++ b/static/templates/user_presence_row.hbs @@ -12,5 +12,5 @@ {{#if num_unread}}{{num_unread}}{{/if}} - +
    • diff --git a/templates/zerver/app/left_sidebar.html b/templates/zerver/app/left_sidebar.html index 1fdf229bbf..aaf6f116f2 100644 --- a/templates/zerver/app/left_sidebar.html +++ b/templates/zerver/app/left_sidebar.html @@ -11,7 +11,7 @@ {{ _('All messages') }} - +
  • @@ -46,7 +46,7 @@ {{ _('Starred messages') }} - +
  • diff --git a/templates/zerver/archive/single_message.html b/templates/zerver/archive/single_message.html index 705d5935a1..dfce0f4924 100644 --- a/templates/zerver/archive/single_message.html +++ b/templates/zerver/archive/single_message.html @@ -11,7 +11,7 @@ {{ sender_full_name }} {% if sender_is_bot %} - + {% endif %} {{ status_message }} @@ -20,7 +20,7 @@ {% else %} {{ sender_full_name }} {% if sender_is_bot %} - + {% endif %} {% endif %} {% endif %} diff --git a/templates/zerver/help/delete-a-topic.md b/templates/zerver/help/delete-a-topic.md index 5a05c6916b..34e2c7a50a 100644 --- a/templates/zerver/help/delete-a-topic.md +++ b/templates/zerver/help/delete-a-topic.md @@ -24,7 +24,7 @@ whereas [archiving a stream](/help/archive-a-stream) does not. 1. Hover over the topic in the **left sidebar**. -1. Click the ellipsis (). +1. Click the ellipsis (). 1. Click **Delete topic**. diff --git a/templates/zerver/help/emoji-reactions.md b/templates/zerver/help/emoji-reactions.md index ddb3da045c..528db9813c 100644 --- a/templates/zerver/help/emoji-reactions.md +++ b/templates/zerver/help/emoji-reactions.md @@ -15,7 +15,7 @@ underneath the message. !!! warn "" For messages that you've sent, click the ellipsis - () and then + () and then **Add emoji reaction**. 1. Select an emoji. Type to search, use the arrow keys, or click on an emoji diff --git a/templates/zerver/help/include/message-actions-menu.md b/templates/zerver/help/include/message-actions-menu.md index e54dcf3461..db82e8402c 100644 --- a/templates/zerver/help/include/message-actions-menu.md +++ b/templates/zerver/help/include/message-actions-menu.md @@ -1,3 +1,3 @@ 1. Hover over a message to reveal three icons on the right. -1. Click the ellipsis (). +1. Click the ellipsis (). diff --git a/templates/zerver/help/include/stream-actions.md b/templates/zerver/help/include/stream-actions.md index 6a826095cd..4869964cc2 100644 --- a/templates/zerver/help/include/stream-actions.md +++ b/templates/zerver/help/include/stream-actions.md @@ -1,3 +1,3 @@ 1. Hover over a stream in the left sidebar. -1. Click on the ellipsis (). +1. Click on the ellipsis (). diff --git a/templates/zerver/help/marking-messages-as-read.md b/templates/zerver/help/marking-messages-as-read.md index 06a6ce6ddc..fbc380f013 100644 --- a/templates/zerver/help/marking-messages-as-read.md +++ b/templates/zerver/help/marking-messages-as-read.md @@ -22,7 +22,7 @@ stream or topic as read**. 1. Hover over a stream, topic, or All messages in the left sidebar. -1. Click the ellipsis () to the right. +1. Click the ellipsis () to the right. 1. Click **Mark all messages as read**. diff --git a/templates/zerver/help/mention-a-user-or-group.md b/templates/zerver/help/mention-a-user-or-group.md index eb6e1b3b95..557518977e 100644 --- a/templates/zerver/help/mention-a-user-or-group.md +++ b/templates/zerver/help/mention-a-user-or-group.md @@ -23,7 +23,7 @@ messages and alert words. 1. Hover over a user in the right sidebar. -1. Click the ellipsis () to the right. +1. Click the ellipsis () to the right. 1. Select **Reply mentioning user**. diff --git a/templates/zerver/help/mute-a-topic.md b/templates/zerver/help/mute-a-topic.md index 452956fced..5462ffd724 100644 --- a/templates/zerver/help/mute-a-topic.md +++ b/templates/zerver/help/mute-a-topic.md @@ -15,8 +15,8 @@ Muted topics still appear in the left sidebar, though they are grayed out. 1. On the left, click on the stream that contains the topic you want to mute or unmute. 2. Hover over the topic to reveal a ellipsis - () to its right. - Click on the ellipsis (). + () to its right. + Click on the ellipsis (). 4. Select **Mute the topic **. diff --git a/templates/zerver/help/status-and-availability.md b/templates/zerver/help/status-and-availability.md index 236e5bd507..9fc1220ac0 100644 --- a/templates/zerver/help/status-and-availability.md +++ b/templates/zerver/help/status-and-availability.md @@ -17,7 +17,7 @@ teammates know when you were last active. 1. Hover over your name in the right sidebar. -1. Click the ellipsis () to the right. +1. Click the ellipsis () to the right. 1. Click **Set a status message**. @@ -63,7 +63,7 @@ unavailable). 1. Hover over your name in the right sidebar. -1. Click the ellipsis () to the right. +1. Click the ellipsis () to the right. 1. Click **Set yourself as unavailable**. diff --git a/templates/zerver/help/stream-notifications.md b/templates/zerver/help/stream-notifications.md index 44a7d53f68..e0a85361b9 100644 --- a/templates/zerver/help/stream-notifications.md +++ b/templates/zerver/help/stream-notifications.md @@ -9,7 +9,7 @@ stream basis. 1. Hover over the stream in the left sidebar. -2. Click the ellipsis () to the +2. Click the ellipsis () to the right of the stream. 3. Click **Stream settings**. diff --git a/templates/zerver/help/view-someones-profile.md b/templates/zerver/help/view-someones-profile.md index e145f77a06..4ca3880aa7 100644 --- a/templates/zerver/help/view-someones-profile.md +++ b/templates/zerver/help/view-someones-profile.md @@ -22,7 +22,7 @@ when they were last active, and any 1. Hover over a user's name in the right sidebar. -1. Click on the ellipsis () to +1. Click on the ellipsis () to the right of their name. 1. Click **View full profile**.