diff --git a/webapp/channels/src/components/common/svg_images_components/channel_files_svg.tsx b/webapp/channels/src/components/common/svg_images_components/channel_files_svg.tsx index d0197c2844..852ca42d3a 100644 --- a/webapp/channels/src/components/common/svg_images_components/channel_files_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/channel_files_svg.tsx @@ -9,55 +9,250 @@ export function ChannelFilesSVG(props: React.HTMLAttributes) { return ( - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); } diff --git a/webapp/channels/src/components/common/svg_images_components/channel_intro_private_svg.tsx b/webapp/channels/src/components/common/svg_images_components/channel_intro_private_svg.tsx index d92dd0bada..6518799f95 100644 --- a/webapp/channels/src/components/common/svg_images_components/channel_intro_private_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/channel_intro_private_svg.tsx @@ -10,158 +10,232 @@ type SvgProps = { const PrivateChannelIntroSvg = (props: SvgProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + ); diff --git a/webapp/channels/src/components/common/svg_images_components/channel_intro_public_svg.tsx b/webapp/channels/src/components/common/svg_images_components/channel_intro_public_svg.tsx index bde8223d73..84170a9f82 100644 --- a/webapp/channels/src/components/common/svg_images_components/channel_intro_public_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/channel_intro_public_svg.tsx @@ -10,246 +10,219 @@ type SvgProps = { const PublicChannelIntroSvg = (props: SvgProps) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + + ); export default PublicChannelIntroSvg; diff --git a/webapp/channels/src/components/common/svg_images_components/channel_intro_town_square_svg.tsx b/webapp/channels/src/components/common/svg_images_components/channel_intro_town_square_svg.tsx index caa63bb848..ba61143f99 100644 --- a/webapp/channels/src/components/common/svg_images_components/channel_intro_town_square_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/channel_intro_town_square_svg.tsx @@ -10,169 +10,214 @@ type SvgProps = { const SvgComponent = (props: SvgProps) => ( - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + + + + - - - - - - - + - - + ); diff --git a/webapp/channels/src/components/common/svg_images_components/channel_search_svg.tsx b/webapp/channels/src/components/common/svg_images_components/channel_search_svg.tsx index 9e46c4b23c..b30fdcd108 100644 --- a/webapp/channels/src/components/common/svg_images_components/channel_search_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/channel_search_svg.tsx @@ -9,66 +9,196 @@ export function ChannelSearchSVG(props: React.HTMLAttributes) { return ( - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/common/svg_images_components/index.ts b/webapp/channels/src/components/common/svg_images_components/index.ts index 847706bc16..265e2d46a9 100644 --- a/webapp/channels/src/components/common/svg_images_components/index.ts +++ b/webapp/channels/src/components/common/svg_images_components/index.ts @@ -8,4 +8,3 @@ export {SavedMessagesSVG} from './saved_messages_svg'; export {PinSVG} from './pin_svg'; export {ChannelFilesSVG} from './channel_files_svg'; export {UserGroupsSVG} from './user_groups_svg'; -export {UserGroupMembersSVG} from './user_groups_members_svg'; diff --git a/webapp/channels/src/components/common/svg_images_components/mentons_svg.tsx b/webapp/channels/src/components/common/svg_images_components/mentons_svg.tsx index 56922ed046..f0413684ce 100644 --- a/webapp/channels/src/components/common/svg_images_components/mentons_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/mentons_svg.tsx @@ -9,54 +9,137 @@ export function MentionsSVG(props: React.HTMLAttributes) { return ( - - - + + + + + + + + + + + + + + + - ); } diff --git a/webapp/channels/src/components/common/svg_images_components/pin_svg.tsx b/webapp/channels/src/components/common/svg_images_components/pin_svg.tsx index 0d42634da2..ee1bd401e4 100644 --- a/webapp/channels/src/components/common/svg_images_components/pin_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/pin_svg.tsx @@ -6,48 +6,155 @@ import {useIntl} from 'react-intl'; export function PinSVG(props: React.HTMLAttributes) { const {formatMessage} = useIntl(); + return ( - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx b/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx index c956884d3a..52f059e3ca 100644 --- a/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/saved_messages_svg.tsx @@ -9,50 +9,136 @@ export function SavedMessagesSVG(props: React.HTMLAttributes) { return ( - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/common/svg_images_components/search_svg.tsx b/webapp/channels/src/components/common/svg_images_components/search_svg.tsx index d31824b215..269699819c 100644 --- a/webapp/channels/src/components/common/svg_images_components/search_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/search_svg.tsx @@ -9,42 +9,138 @@ export function SearchSVG(props: React.HTMLAttributes) { return ( - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/common/svg_images_components/user_groups_members_svg.tsx b/webapp/channels/src/components/common/svg_images_components/user_groups_members_svg.tsx deleted file mode 100644 index 17feb79330..0000000000 --- a/webapp/channels/src/components/common/svg_images_components/user_groups_members_svg.tsx +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -import React from 'react'; -import {useIntl} from 'react-intl'; - -export function UserGroupMembersSVG(props: React.HTMLAttributes) { - const {formatMessage} = useIntl(); - return ( - - - - - - - - - - - - - - ); -} diff --git a/webapp/channels/src/components/common/svg_images_components/user_groups_svg.tsx b/webapp/channels/src/components/common/svg_images_components/user_groups_svg.tsx index 1d13b073d0..60eae87f0c 100644 --- a/webapp/channels/src/components/common/svg_images_components/user_groups_svg.tsx +++ b/webapp/channels/src/components/common/svg_images_components/user_groups_svg.tsx @@ -9,174 +9,217 @@ export function UserGroupsSVG(props: React.HTMLAttributes) { return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ); } diff --git a/webapp/channels/src/components/drafts/drafts_illustration.tsx b/webapp/channels/src/components/drafts/drafts_illustration.tsx index b48f249bb8..36276953a2 100644 --- a/webapp/channels/src/components/drafts/drafts_illustration.tsx +++ b/webapp/channels/src/components/drafts/drafts_illustration.tsx @@ -5,68 +5,161 @@ import React from 'react'; export default ( - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/webapp/channels/src/components/drafts/scheduled_post_list/empty_scheduled_post_list_illustration.tsx b/webapp/channels/src/components/drafts/scheduled_post_list/empty_scheduled_post_list_illustration.tsx index a23047c574..d62dadf3c1 100644 --- a/webapp/channels/src/components/drafts/scheduled_post_list/empty_scheduled_post_list_illustration.tsx +++ b/webapp/channels/src/components/drafts/scheduled_post_list/empty_scheduled_post_list_illustration.tsx @@ -5,64 +5,161 @@ import React from 'react'; export default ( - - + + + + + + + + + + + + + + - + - ); diff --git a/webapp/channels/src/components/no_results_indicator/no_results_indicator.scss b/webapp/channels/src/components/no_results_indicator/no_results_indicator.scss index 017f1ecf96..32c9c0f44c 100644 --- a/webapp/channels/src/components/no_results_indicator/no_results_indicator.scss +++ b/webapp/channels/src/components/no_results_indicator/no_results_indicator.scss @@ -37,8 +37,6 @@ .no-results__variant-wrapper { display: flex; - width: 120px; - height: 120px; align-items: center; justify-content: center; border-radius: 100%; @@ -62,9 +60,7 @@ display: flex; svg { - width: 140px; - height: 140px; - fill: var(--button-bg); + fill: none; } &.icon { diff --git a/webapp/channels/src/components/no_results_indicator/no_results_indicator.tsx b/webapp/channels/src/components/no_results_indicator/no_results_indicator.tsx index c42a99e43b..926f4a1472 100644 --- a/webapp/channels/src/components/no_results_indicator/no_results_indicator.tsx +++ b/webapp/channels/src/components/no_results_indicator/no_results_indicator.tsx @@ -6,7 +6,7 @@ import React from 'react'; import type {ReactNode, CSSProperties} from 'react'; import {FormattedMessage, defineMessages} from 'react-intl'; -import {SearchSVG, ChannelSearchSVG, MentionsSVG, SavedMessagesSVG, PinSVG, ChannelFilesSVG, UserGroupsSVG, UserGroupMembersSVG} from 'components/common/svg_images_components'; +import {SearchSVG, ChannelSearchSVG, MentionsSVG, SavedMessagesSVG, PinSVG, ChannelFilesSVG, UserGroupsSVG} from 'components/common/svg_images_components'; import {NoResultsVariant, NoResultsLayout} from './types'; import './no_results_indicator.scss'; @@ -35,7 +35,7 @@ const iconMap: {[key in NoResultsVariant]: React.ReactNode } = { [NoResultsVariant.ChannelFiles]: , [NoResultsVariant.ChannelFilesFiltered]: , [NoResultsVariant.UserGroups]: , - [NoResultsVariant.UserGroupMembers]: , + [NoResultsVariant.UserGroupMembers]: , [NoResultsVariant.UserGroupsArchived]: , }; diff --git a/webapp/channels/src/components/threading/common/balloon_illustration.tsx b/webapp/channels/src/components/threading/common/balloon_illustration.tsx deleted file mode 100644 index 4aacf950cc..0000000000 --- a/webapp/channels/src/components/threading/common/balloon_illustration.tsx +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -import React from 'react'; - -const BalloonIllustration = ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - -); - -export default BalloonIllustration; diff --git a/webapp/channels/src/components/threading/common/chat_illustration.tsx b/webapp/channels/src/components/threading/common/chat_illustration.tsx index de06aa46ab..1a972d99bf 100644 --- a/webapp/channels/src/components/threading/common/chat_illustration.tsx +++ b/webapp/channels/src/components/threading/common/chat_illustration.tsx @@ -5,275 +5,162 @@ import React from 'react'; const ChatIllustration = ( - - - - - - + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + - - - - - - - - - - + ); diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx index 34264b8427..2dd51898b8 100644 --- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx +++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx @@ -31,7 +31,6 @@ import type {GlobalState} from 'types/store'; import VirtualizedThreadList from './virtualized_thread_list'; -import BalloonIllustration from '../../common/balloon_illustration'; import Button from '../../common/button'; import {useThreadRouting} from '../../hooks'; import MarkAllThreadsAsReadModal from '../mark_all_threads_as_read_modal'; @@ -268,11 +267,14 @@ const ThreadList = ({ {unread && !someUnread && isEmpty(unreadIds) ? ( ) : null} diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 60ab5dbc41..cd5a034597 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -3925,7 +3925,6 @@ "generic_icons.success": "Success Icon", "generic_icons.upgradeBadge": "Upgrade badge", "generic_icons.upload": "Upload Icon", - "generic_icons.user_group_members": "User Group Members Icon", "generic_icons.user_groups": "User Groups Icon", "generic_icons.userGuide": "Help", "generic_icons.warning": "Warning Icon", @@ -3968,6 +3967,7 @@ "globalThreads.searchGuidance.title": "That’s the end of the list", "globalThreads.sidebarLink": "Threads", "globalThreads.threadList.noUnreadThreads": "No unread threads", + "globalThreads.threadList.noUnreadThreads.subtitle": "You're all caught up", "globalThreads.threadPane.unreadMessageLink": "You have {numUnread, plural, =0 {no unread threads} =1 {{numUnread} thread} other {{numUnread} threads}} {numUnread, plural, =0 {} other {with unread messages}}", "globalThreads.threadPane.unselectedTitle": "{numUnread, plural, =0 {Looks like you’re all caught up} other {Catch up on your threads}}", "globalThreads.title": "{prefix}Threads - {displayName} {siteName}",