Merge branch 'tweaks' into 'develop'

Upstream branding tweaks

See merge request soapbox-pub/soapbox-fe!1720
This commit is contained in:
Justin 2022-08-09 16:02:05 +00:00
commit 917d07ae25
5 changed files with 10 additions and 10 deletions

View file

@ -117,7 +117,7 @@ const Account = ({
src={actionIcon} src={actionIcon}
title={actionTitle} title={actionTitle}
onClick={handleAction} onClick={handleAction}
className='bg-transparent text-gray-400 hover:text-gray-600' className='bg-transparent text-gray-600 dark:text-gray-600 hover:text-gray-700 dark:hover:text-gray-500'
iconClassName='w-4 h-4' iconClassName='w-4 h-4'
/> />
); );

View file

@ -10,11 +10,11 @@ interface IBadge {
const Badge: React.FC<IBadge> = ({ title, slug }) => ( const Badge: React.FC<IBadge> = ({ title, slug }) => (
<span <span
data-testid='badge' data-testid='badge'
className={classNames('inline-flex items-center px-2 py-0.5 rounded text-xs font-medium text-white', { className={classNames('inline-flex items-center px-2 py-0.5 rounded text-xs font-medium', {
'bg-fuchsia-700': slug === 'patron', 'bg-fuchsia-700 text-white': slug === 'patron',
'bg-yellow-500': slug === 'donor', 'bg-yellow-500 text-white': slug === 'donor',
'bg-black': slug === 'admin', 'bg-black text-white': slug === 'admin',
'bg-cyan-600': slug === 'moderator', 'bg-cyan-600 text-white': slug === 'moderator',
'bg-gray-100 dark:bg-gray-800 text-gray-900 dark:text-gray-100': slug === 'bot', 'bg-gray-100 dark:bg-gray-800 text-gray-900 dark:text-gray-100': slug === 'bot',
'bg-white bg-opacity-75 text-gray-900': slug === 'opaque', 'bg-white bg-opacity-75 text-gray-900': slug === 'opaque',
})} })}

View file

@ -126,8 +126,8 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
<Stack <Stack
data-testid='quoted-status' data-testid='quoted-status'
space={2} space={2}
className={classNames('mt-3 p-4 rounded-lg border border-solid border-gray-100 dark:border-gray-800 cursor-pointer', { className={classNames('mt-3 p-4 rounded-lg border border-solid border-gray-300 dark:border-gray-800 cursor-pointer', {
'hover:bg-gray-50 dark:hover:bg-gray-800': !compose, 'hover:bg-gray-100 dark:hover:bg-gray-800': !compose,
})} })}
onClick={handleExpandClick} onClick={handleExpandClick}
> >

View file

@ -84,7 +84,7 @@ const Header = () => {
title='Open Menu' title='Open Menu'
src={require('@tabler/icons/menu-2.svg')} src={require('@tabler/icons/menu-2.svg')}
onClick={open} onClick={open}
className='md:hidden mr-4 bg-transparent text-gray-400 hover:text-gray-600' className='md:hidden mr-4 bg-transparent text-gray-700 dark:text-gray-600 hover:text-gray-600'
/> />
<Link to='/' className='z-10'> <Link to='/' className='z-10'>

View file

@ -44,7 +44,7 @@ const LandingPageModal: React.FC<ILandingPageModal> = ({ onClose }) => {
target='_blank' target='_blank'
className='p-3 space-x-3 flex items-center rounded-md dark:hover:bg-gray-900/50 hover:bg-gray-50' className='p-3 space-x-3 flex items-center rounded-md dark:hover:bg-gray-900/50 hover:bg-gray-50'
> >
<Icon src={require('@tabler/icons/lifebuoy.svg')} className='flex-shrink-0 h-6 w-6 text-gray-400 dark:text-gray-200' /> <Icon src={require('@tabler/icons/lifebuoy.svg')} className='flex-shrink-0 h-6 w-6 text-gray-600 dark:text-gray-700' />
<Text weight='medium'> <Text weight='medium'>
{intl.formatMessage(messages.helpCenter)} {intl.formatMessage(messages.helpCenter)}