From 35c5231fe61614bc8d721036a4262a22de70616d Mon Sep 17 00:00:00 2001 From: nimishmedatwal Date: Wed, 6 Mar 2024 16:06:48 +0530 Subject: [PATCH] left-sidebar: Change recent conversation icon. Fixes #29180 --- docs/THIRDPARTY | 22 +++++++++++++++++++ help/include/go-to-recent-conversations.md | 4 ++-- web/shared/icons/recent.svg | Bin 0 -> 346 bytes web/src/message_view_header.js | 2 +- web/templates/introduce_zulip_view_modal.hbs | 4 ++-- web/templates/left_sidebar.hbs | 4 ++-- 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 web/shared/icons/recent.svg diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY index 716fc1faf6..8c6baf0277 100644 --- a/docs/THIRDPARTY +++ b/docs/THIRDPARTY @@ -258,6 +258,11 @@ Copyright: 2022, Quansight Labs License: BSD-3-Clause Comment: GitHub theme (light and dark); Selectors have been modified for use with Zulip +Files: web/shared/icons/recent.svg +Source: https://lucide.dev/icons/clock-10 +Copyright: 2013-2022 Cole Bemis +License: ISC License + Files: web/third/bootstrap/css/bootstrap.app.css Copyright: 2012 Twitter, Inc. License: Apache-2.0 @@ -1472,3 +1477,20 @@ License: GPL-2.0+ . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. + +License: ISC License + Copyright (c) for portions of Lucide are held by Cole Bemis 2013-2022 + as part of Feather (MIT). All other copyright (c) for Lucide are held + by Lucide Contributors 2022. + . + Permission to use, copy, modify, and/or distribute this software for + any purpose with or without fee is hereby granted, provided that the + above copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE + FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY + DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE ORPERFORMANCE OF THIS SOFTWARE diff --git a/help/include/go-to-recent-conversations.md b/help/include/go-to-recent-conversations.md index be4e04efd8..3f85d7c3f5 100644 --- a/help/include/go-to-recent-conversations.md +++ b/help/include/go-to-recent-conversations.md @@ -1,4 +1,4 @@ -1. Click on **Recent conversations** - (or if the **views** +1. Click on **Recent conversations** + (or if the **views** section is collapsed) in the left sidebar, or use the T keyboard shortcut. diff --git a/web/shared/icons/recent.svg b/web/shared/icons/recent.svg new file mode 100644 index 0000000000000000000000000000000000000000..7deb474516b8447bfd0f686154ce38a3c518636c GIT binary patch literal 346 zcmZ8d%WlIU5d4)DJ!g3tY*)roa&E3YbN3 literal 0 HcmV?d00001 diff --git a/web/src/message_view_header.js b/web/src/message_view_header.js index 0fc26d0656..53006e23c2 100644 --- a/web/src/message_view_header.js +++ b/web/src/message_view_header.js @@ -16,7 +16,7 @@ function get_message_view_header_context(filter) { if (recent_view_util.is_visible()) { return { title: $t({defaultMessage: "Recent conversations"}), - zulip_icon: "clock", + zulip_icon: "recent", }; } if (inbox_util.is_visible()) { diff --git a/web/templates/introduce_zulip_view_modal.hbs b/web/templates/introduce_zulip_view_modal.hbs index 1758995f14..2b8728eb3f 100644 --- a/web/templates/introduce_zulip_view_modal.hbs +++ b/web/templates/introduce_zulip_view_modal.hbs @@ -27,8 +27,8 @@ {{/tr}} {{else if (eq zulip_view "recent_conversations")}} {{#tr}} - Click Recent conversations in the left sidebar. - {{#*inline "z-icon-clock"}}{{/inline}} + Click Recent conversations in the left sidebar. + {{#*inline "z-icon-recent"}}{{/inline}} {{/tr}} {{/if}} diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs index 504e4b722d..3ada58b7f4 100644 --- a/web/templates/left_sidebar.hbs +++ b/web/templates/left_sidebar.hbs @@ -16,7 +16,7 @@
  • - + {{~!-- squash whitespace --~}} {{t 'Recent conversations' }}