mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'update-thumb-navigation' into 'main' 

Update thumb navigation

Closes #1807

See merge request soapbox-pub/soapbox!3314
merge-requests/3315/head
Alex Gleason 2025-01-27 16:50:19 +00:00
rodzic 0cc13cadfc c5a3a28c5d
commit d567a5b1db
3 zmienionych plików z 12 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/components/icon-with-counter.tsx
Wyświetl plik

@ -1,5 +1,6 @@
import Icon, { IIcon } from 'soapbox/components/icon.tsx';
import { IIcon } from 'soapbox/components/icon.tsx';
import Counter from 'soapbox/components/ui/counter.tsx';
import Icon from 'soapbox/components/ui/icon.tsx';
interface IIconWithCounter extends React.HTMLAttributes<HTMLDivElement> {
count: number;

2
src/components/sidebar-navigation-link.tsx
Wyświetl plik

@ -55,7 +55,7 @@ const SidebarNavigationLink = forwardRef((props: ISidebarNavigationLink, ref: Re
count={count}
countMax={countMax}
className={clsx('size-5', {
'text-gray-600 black:text-white dark:text-gray-500 group-hover:text-gray-900 dark:group-hover:text-gray-50': !isActive,
'text-gray-600 black:text-gray-500 dark:text-gray-500 group-hover:text-gray-900 dark:group-hover:text-gray-50': !isActive,
'text-gray-900 dark:text-gray-50': isActive,
})}
/>

18
src/components/thumb-navigation-link.tsx
Wyświetl plik

@ -37,9 +37,9 @@ const ThumbNavigationLink: React.FC<IThumbNavigationLink> = ({ count, countMax,
<IconWithCounter
src={icon}
className={clsx({
'h-5 w-5': true,
'text-gray-600 black:text-white': !active,
'text-primary-500': active,
'size-5': true,
'text-black dark:text-white black:text-white': active,
'text-gray-600': !active,
})}
count={count}
countMax={countMax}
@ -48,9 +48,9 @@ const ThumbNavigationLink: React.FC<IThumbNavigationLink> = ({ count, countMax,
<Icon
src={icon}
className={clsx({
'h-5 w-5': true,
'text-gray-600 black:text-white': !active,
'text-primary-500': active,
'size-5': true,
'text-black black:text-white dark:text-white': active,
'text-gray-600 black:text-gray-500 dark:text-gray-500': !active,
})}
/>
)}
@ -60,9 +60,9 @@ const ThumbNavigationLink: React.FC<IThumbNavigationLink> = ({ count, countMax,
size='xs'
weight='medium'
className={clsx({
'text-gray-600': !active,
'text-primary-500': active,
})}
'text-gray-600 black:text-white dark:text-white': active,
'!text-gray-600 black:!text-gray-500 dark:!text-gray-500': !active,
})}text-primary-500
>
{text}
</Text>