Merge remote-tracking branch 'origin/next' into next-emoji-reacts

app/soapbox/components/sidebar_menu.js

@@ -37,11 +37,11 @@ const messages = defineMessages({
 const SidebarLink = ({ to, icon, text, onClick }) => (
   <NavLink className='group py-1 rounded-md' to={to} onClick={onClick}>
     <HStack space={2} alignItems='center'>
-      <div className='bg-gray-50 relative rounded inline-flex p-2'>
+      <div className='bg-primary-50 dark:bg-slate-700 relative rounded inline-flex p-2'>
         <Icon src={icon} className='text-primary-600 h-5 w-5' />
       </div>
 
-      <Text tag='span' weight='medium' theme='muted' className='group-hover:text-gray-800'>{text}</Text>
+      <Text tag='span' weight='medium' theme='muted' className='group-hover:text-gray-800 dark:group-hover:text-gray-200'>{text}</Text>
     </HStack>
   </NavLink>
 );
@@ -130,7 +130,15 @@ const SidebarMenu = () => {
             <Stack space={4}>
               <HStack alignItems='center' justifyContent='between'>
                 <Link to='/' onClick={onClose}>
-                  <img alt='Logo' src={logo} className='h-5 w-auto min-w-[140px] cursor-pointer' />
+                  {logo ? (
+                    <img alt='Logo' src={logo} className='h-5 w-auto min-w-[140px] cursor-pointer' />
+                  ):  (
+                    <Icon
+                      alt='Logo'
+                      src={require('@tabler/icons/icons/home.svg')}
+                      className='h-6 w-6 text-gray-400 hover:text-gray-600 dark:text-gray-200 cursor-pointer'
+                    />
+                  )}
                 </Link>
 
                 <IconButton
@@ -255,7 +263,7 @@ const SidebarMenu = () => {
 
                 <SidebarLink
                   to='/auth/sign_out'
-                  icon='logout'
+                  icon={require('@tabler/icons/icons/logout.svg')}
                   text={intl.formatMessage(messages.logout)}
                   onClick={onClickLogOut}
                 />