Merge remote-tracking branch 'soapbox/develop' into HEAD

app/soapbox/components/markup.css

@@ -35,7 +35,8 @@
   @apply py-1 pl-4 mb-4 border-l-4 border-solid border-gray-400 text-gray-500 dark:text-gray-400;
 }
 
-[data-markup] code {
+[data-markup] code,
+[data-markup] pre {
   @apply cursor-text font-mono;
 }
 

app/soapbox/components/ui/column/column.tsx

@@ -7,10 +7,10 @@ import { useSoapboxConfig } from 'soapbox/hooks';
 
 import { Card, CardBody, CardHeader, CardTitle } from '../card/card';
 
-type IColumnHeader = Pick<IColumn, 'label' | 'backHref' |'transparent'>;
+type IColumnHeader = Pick<IColumn, 'label' | 'backHref' |'className'>;
 
 /** Contains the column title with optional back button. */
-const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, transparent }) => {
+const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, className }) => {
   const history = useHistory();
 
   const handleBackClick = () => {
@@ -27,10 +27,7 @@ const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, transparent })
   };
 
   return (
-    <CardHeader
-      className={classNames({ 'px-4 pt-4 sm:p-0': transparent })}
-      onBackClick={handleBackClick}
-    >
+    <CardHeader className={className} onBackClick={handleBackClick}>
       <CardTitle title={label} />
     </CardHeader>
   );
@@ -72,7 +69,11 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
 
       <Card variant={transparent ? undefined : 'rounded'} className={className}>
         {withHeader && (
-          <ColumnHeader label={label} backHref={backHref} transparent={transparent} />
+          <ColumnHeader
+            label={label}
+            backHref={backHref}
+            className={classNames({ 'px-4 pt-4 sm:p-0': transparent })}
+          />
         )}
 
         <CardBody>

app/soapbox/features/community-timeline/index.tsx

@@ -40,7 +40,7 @@ const CommunityTimeline = () => {
   }, [onlyMedia]);
 
   return (
-    <Column label={intl.formatMessage(messages.title)} transparent>
+    <Column className='-mt-3 sm:mt-0' label={intl.formatMessage(messages.title)} transparent>
       <PullToRefresh onRefresh={handleRefresh}>
         <Timeline
           scrollKey={`${timelineId}_timeline`}

app/soapbox/features/public-timeline/index.tsx

@@ -60,7 +60,7 @@ const CommunityTimeline = () => {
   }, [onlyMedia]);
 
   return (
-    <Column label={intl.formatMessage(messages.title)} transparent>
+    <Column className='-mt-3 sm:mt-0' label={intl.formatMessage(messages.title)} transparent>
       <PinnedHostsPicker />
 
       {showExplanationBox && <div className='mb-4'>

app/styles/forms.scss

@@ -24,11 +24,6 @@ select {
 
 $no-columns-breakpoint: 600px;
 
-code {
-  font-family: var(--font-monospace), monospace;
-  font-weight: 400;
-}
-
 .form-container {
   max-width: 400px;
   padding: 20px;