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

2022-10-06 00:01:39 +02:00
parent 3c8c8048e5 c2757f27c6
commit 814dcfe2cd
23 changed files with 1748 additions and 1752 deletions
--- a/app/soapbox/normalizers/attachment.ts
+++ b/app/soapbox/normalizers/attachment.ts
@ -20,7 +20,7 @@ export const AttachmentRecord = ImmutableRecord({
  meta: ImmutableMap(),
  pleroma: ImmutableMap(),
  preview_url: '',
-  remote_url: null,
+  remote_url: null as string | null,
  type: 'unknown',
  url: '',

--- a/app/soapbox/normalizers/soapbox/soapbox_config.ts
+++ b/app/soapbox/normalizers/soapbox/soapbox_config.ts
@ -44,6 +44,7 @@ const DEFAULT_COLORS = ImmutableMap<string, any>({
    900: '#7f1d1d',
  }),
  'sea-blue': '#2feecc',
+  'greentext': '#789922',
 });

 export const PromoPanelItemRecord = ImmutableRecord({