diff --git a/packages/nicolium/src/components/accounts/profile-stats.tsx b/packages/nicolium/src/components/accounts/profile-stats.tsx index 6fbd8695c..d524fb55a 100644 --- a/packages/nicolium/src/components/accounts/profile-stats.tsx +++ b/packages/nicolium/src/components/accounts/profile-stats.tsx @@ -2,7 +2,6 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Text from '@/components/ui/text'; import { useSettings } from '@/stores/settings'; import { shortNumberFormat } from '@/utils/numbers'; @@ -44,18 +43,11 @@ const ProfileStats: React.FC = ({ account, onClickHandler }) => { } return ( -
+
{!demetricator && ( -
- - {shortNumberFormat(account.statuses_count)} - - - - +
+ {shortNumberFormat(account.statuses_count)} +
)} @@ -63,44 +55,22 @@ const ProfileStats: React.FC = ({ account, onClickHandler }) => { to='/@{$username}/followers' params={{ username: account.acct }} onClick={onClickHandler} - title={intl.formatNumber(account.followers_count)} - className='hover:underline' + title={intl.formatMessage(messages.followersCount, { count: account.followers_count })} > -
- {!demetricator && ( - - {shortNumberFormat(account.followers_count)} - - )} - - - -
+ {!demetricator && {shortNumberFormat(account.followers_count)}} + + -
- {!demetricator && ( - - {shortNumberFormat(account.following_count)} - - )} - - - -
+ {!demetricator && {shortNumberFormat(account.following_count)}} + + {account.subscribers_count > 0 && ( @@ -108,24 +78,13 @@ const ProfileStats: React.FC = ({ account, onClickHandler }) => { to='/@{$username}/subscribers' params={{ username: account.acct }} onClick={onClickHandler} - title={intl.formatNumber(account.subscribers_count)} - className='hover:underline' + title={intl.formatMessage(messages.subscribersCount, { + count: account.subscribers_count, + })} > -
- {!demetricator && ( - - {shortNumberFormat(account.subscribers_count)} - - )} - - - -
+ {!demetricator && {shortNumberFormat(account.subscribers_count)}} + + )}
diff --git a/packages/nicolium/src/styles/components/datepicker.scss b/packages/nicolium/src/styles/components/datepicker.scss index 90c12782d..6eb8df51d 100644 --- a/packages/nicolium/src/styles/components/datepicker.scss +++ b/packages/nicolium/src/styles/components/datepicker.scss @@ -58,7 +58,7 @@ } .react-datepicker__navigation--next { - @apply right-4; + right: 1rem; &--with-time:not(.react-datepicker__navigation--next--with-today-button) { right: 100px; @@ -76,12 +76,13 @@ } .react-datepicker__header__dropdown { - @apply py-4; + padding: 1rem 0; } .react-datepicker__day-names, .react-datepicker__week { - @apply flex justify-between; + display: flex; + justify-content: space-between; } .react-datepicker__time { diff --git a/packages/nicolium/src/styles/new/accounts.scss b/packages/nicolium/src/styles/new/accounts.scss index 00cc54e41..b60974f0e 100644 --- a/packages/nicolium/src/styles/new/accounts.scss +++ b/packages/nicolium/src/styles/new/accounts.scss @@ -42,6 +42,32 @@ } } +.⁂-account-stats { + display: flex; + flex-wrap: wrap; + gap: 0.75rem; + align-items: center; + + a, div { + display: flex; + gap: 0.25rem; + align-items: center; + @include mixins.text($weight: bold, $size: sm); + + strong { + color: rgb(var(--color-primary-600)); + + .dark * & { + color: rgb(var(--color-primary-400)); + } + } + } + + a:hover { + text-decoration: underline; + } +} + .⁂-account-card { display: block; flex-shrink: 0;