From 67bf76b03576079622f093a8714a746040363354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sat, 4 Oct 2025 21:17:41 +0200 Subject: [PATCH] pl-fe: replace some icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-fe/package.json | 1 + .../src/components/dropdown-navigation.tsx | 58 ++++++------- .../src/components/sidebar-navigation.tsx | 82 ++++++++++--------- .../pl-fe/src/components/thumb-navigation.tsx | 22 ++--- packages/pl-fe/src/styles/new/layout.scss | 10 +-- pnpm-lock.yaml | 10 ++- 6 files changed, 100 insertions(+), 83 deletions(-) diff --git a/packages/pl-fe/package.json b/packages/pl-fe/package.json index 617cbaeff..1436ecfb6 100644 --- a/packages/pl-fe/package.json +++ b/packages/pl-fe/package.json @@ -55,6 +55,7 @@ "@lexical/selection": "^0.29.0", "@lexical/utils": "^0.29.0", "@mkljczk/url-purify": "^0.0.3", + "@phosphor-icons/core": "^2.1.1", "@reach/combobox": "^0.18.0", "@reach/rect": "^0.18.0", "@reach/tabs": "^0.18.0", diff --git a/packages/pl-fe/src/components/dropdown-navigation.tsx b/packages/pl-fe/src/components/dropdown-navigation.tsx index baf117a79..c88f6ec13 100644 --- a/packages/pl-fe/src/components/dropdown-navigation.tsx +++ b/packages/pl-fe/src/components/dropdown-navigation.tsx @@ -149,7 +149,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { }; const renderAccount = (account: AccountEntity) => ( - +
@@ -222,7 +222,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { @@ -230,7 +230,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {(account.locked || followRequestsCount > 0) && ( @@ -239,7 +239,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {(interactionRequestsCount > 0) && ( @@ -248,7 +248,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.conversations && ( @@ -257,7 +257,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.bookmarks && ( @@ -266,7 +266,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.groups && ( @@ -275,7 +275,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.lists && ( @@ -284,7 +284,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.circles && ( @@ -293,7 +293,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.events && ( @@ -302,7 +302,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.profileDirectory && ( @@ -311,7 +311,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {scheduledStatusCount > 0 && ( @@ -320,7 +320,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {draftCount > 0 && ( @@ -331,7 +331,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { : } onClick={closeSidebar} /> @@ -339,7 +339,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.bubbleTimeline && ( } onClick={closeSidebar} /> @@ -348,7 +348,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.federating && ( } onClick={closeSidebar} /> @@ -359,7 +359,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { @@ -367,7 +367,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.followedHashtagsList && ( @@ -376,7 +376,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {(account.is_admin || account.is_moderator) && ( { @@ -396,7 +396,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { @@ -414,7 +414,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { @@ -423,7 +423,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {otherAccounts.map(account => renderAccount(account))} - + {intl.formatMessage(messages.addAccount)} @@ -436,7 +436,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.publicTimeline && !restrictUnauth.timelines.local && <> : } onClick={closeSidebar} /> @@ -444,7 +444,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.bubbleTimeline && !restrictUnauth.timelines.bubble && ( } onClick={closeSidebar} /> @@ -453,7 +453,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {features.federating && !restrictUnauth.timelines.federated && ( } onClick={closeSidebar} /> @@ -464,7 +464,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { @@ -472,7 +472,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { {isOpen && ( @@ -482,7 +482,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => { diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx index b7ca67b2e..4ba6b20b2 100644 --- a/packages/pl-fe/src/components/sidebar-navigation.tsx +++ b/packages/pl-fe/src/components/sidebar-navigation.tsx @@ -86,7 +86,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/conversations', text: intl.formatMessage(messages.conversations), - icon: require('@tabler/icons/outline/mail.svg'), + icon: require('@phosphor-icons/core/regular/envelope-simple.svg'), }); } @@ -94,7 +94,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/follow_requests', text: intl.formatMessage(messages.followRequests), - icon: require('@tabler/icons/outline/user-plus.svg'), + icon: require('@phosphor-icons/core/regular/user-plus.svg'), count: followRequestsCount, }); } @@ -103,7 +103,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/interaction_requests', text: intl.formatMessage(messages.interactionRequests), - icon: require('@tabler/icons/outline/flag-question.svg'), + icon: require('@phosphor-icons/core/regular/heart-half.svg'), count: interactionRequestsCount, }); } @@ -112,7 +112,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/bookmarks', text: intl.formatMessage(messages.bookmarks), - icon: require('@tabler/icons/outline/bookmark.svg'), + icon: require('@phosphor-icons/core/regular/bookmarks.svg'), }); } @@ -120,7 +120,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/lists', text: intl.formatMessage(messages.lists), - icon: require('@tabler/icons/outline/list.svg'), + icon: require('@phosphor-icons/core/regular/list-dashes.svg'), }); } @@ -128,7 +128,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/circles', text: intl.formatMessage(messages.circles), - icon: require('@tabler/icons/outline/chart-circles.svg'), + icon: require('@phosphor-icons/core/regular/circles-three.svg'), }); } @@ -136,7 +136,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/events', text: intl.formatMessage(messages.events), - icon: require('@tabler/icons/outline/calendar-event.svg'), + icon: require('@phosphor-icons/core/regular/calendar-dot.svg'), }); } @@ -144,7 +144,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/directory', text: intl.formatMessage(messages.profileDirectory), - icon: require('@tabler/icons/outline/address-book.svg'), + icon: require('@phosphor-icons/core/regular/address-book.svg'), }); } @@ -152,14 +152,14 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push({ to: '/followed_tags', text: intl.formatMessage(messages.followedTags), - icon: require('@tabler/icons/outline/hash.svg'), + icon: require('@phosphor-icons/core/regular/hash.svg'), }); } if (scheduledStatusCount > 0) { menu.push({ to: '/scheduled_statuses', - icon: require('@tabler/icons/outline/calendar-stats.svg'), + icon: require('@phosphor-icons/core/regular/hourglass.svg'), text: intl.formatMessage(messages.scheduledStatuses), count: scheduledStatusCount, }); @@ -168,7 +168,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) if (draftCount > 0) { menu.push({ to: '/draft_statuses', - icon: require('@tabler/icons/outline/notes.svg'), + icon: require('@phosphor-icons/core/regular/pencil-simple.svg'), text: intl.formatMessage(messages.drafts), count: draftCount, }); @@ -177,18 +177,18 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) menu.push(null); menu.push({ - icon: require('@tabler/icons/outline/help-circle.svg'), + icon: require('@phosphor-icons/core/regular/question.svg'), text: intl.formatMessage(messages.help), items: [ { action: () => openModal('HOTKEYS'), - icon: require('@tabler/icons/outline/keyboard.svg'), + icon: require('@phosphor-icons/core/regular/keyboard.svg'), text: intl.formatMessage(messages.keyboardShortcuts), }, { href: sourceCode.url, target: '_blank', - icon: require('@tabler/icons/outline/code.svg'), + icon: require('@phosphor-icons/core/regular/code.svg'), text: intl.formatMessage(messages.sourceCode), }, ], @@ -218,7 +218,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) ) : ( } + action={} disabled withLinkToProfile={false} /> @@ -236,15 +236,16 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) } shrink={shrink} /> } shrink={shrink} /> @@ -253,8 +254,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) <> } shrink={shrink} @@ -263,7 +264,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {features.chats && ( } @@ -274,8 +276,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {!features.chats && features.conversations && ( } shrink={shrink} /> @@ -284,8 +286,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {features.groups && ( } shrink={shrink} /> @@ -293,16 +295,16 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) } shrink={shrink} /> } shrink={shrink} /> @@ -310,7 +312,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {(account.is_admin || account.is_moderator) && ( } shrink={shrink} @@ -324,8 +327,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {(account || !restrictUnauth.timelines.local) && ( : } shrink={shrink} /> @@ -334,8 +337,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {(features.bubbleTimeline && (account || !restrictUnauth.timelines.bubble)) && ( } shrink={shrink} /> @@ -344,7 +347,8 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {(features.federating && (account || !restrictUnauth.timelines.federated)) && ( } shrink={shrink} /> @@ -355,7 +359,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {menu.length > 0 && ( } shrink={shrink} /> @@ -366,14 +370,16 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) } shrink={shrink} /> {isOpen && } shrink={shrink} />} diff --git a/packages/pl-fe/src/components/thumb-navigation.tsx b/packages/pl-fe/src/components/thumb-navigation.tsx index 751cc574d..b75a87d23 100644 --- a/packages/pl-fe/src/components/thumb-navigation.tsx +++ b/packages/pl-fe/src/components/thumb-navigation.tsx @@ -57,7 +57,7 @@ const ThumbNavigation: React.FC = React.memo((): JSX.Element => { onClick={handleOpenComposeModal} title={intl.formatMessage(messages.compose)} > - + ); @@ -68,12 +68,12 @@ const ThumbNavigation: React.FC = React.memo((): JSX.Element => { onClick={isSidebarOpen ? closeSidebar : openSidebar} title={intl.formatMessage(isSidebarOpen ? messages.closeSidebar : messages.openSidebar)} > - + { {/* {features.groups && ( } to='/groups' exact @@ -93,7 +93,8 @@ const ThumbNavigation: React.FC = React.memo((): JSX.Element => { {(!standalone || account) && ( { {account && ( { {account && features.chats && ( <> a { - @apply block py-2; + &__account { + @apply block py-2; - > div { - @apply pointer-events-none; - } + > div { + @apply pointer-events-none; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6129cc3f3..95a7da6a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -166,6 +166,9 @@ importers: '@mkljczk/url-purify': specifier: ^0.0.3 version: 0.0.3 + '@phosphor-icons/core': + specifier: ^2.1.1 + version: 2.1.1 '@reach/combobox': specifier: ^0.18.0 version: 0.18.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1962,6 +1965,9 @@ packages: resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} engines: {node: '>= 10.0.0'} + '@phosphor-icons/core@2.1.1': + resolution: {integrity: sha512-v4ARvrip4qBCImOE5rmPUylOEK4iiED9ZyKjcvzuezqMaiRASCHKcRIuvvxL/twvLpkfnEODCOJp5dM4eZilxQ==} + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -8211,6 +8217,8 @@ snapshots: '@parcel/watcher-win32-x64': 2.5.1 optional: true + '@phosphor-icons/core@2.1.1': {} + '@pkgjs/parseargs@0.11.0': optional: true @@ -10272,7 +10280,7 @@ snapshots: tinyglobby: 0.2.14 unrs-resolver: 1.11.1 optionalDependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@4.4.4)(eslint@8.57.1) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-typescript@4.4.4)(eslint@8.57.1) transitivePeerDependencies: - supports-color