From 8c3ef9b87be92548315320fe0b755875cd82eb1b Mon Sep 17 00:00:00 2001 From: Matilde Park Date: Tue, 18 Aug 2020 17:10:21 -0400 Subject: [PATCH] chat: add blockquotes Fixes #3338. --- pkg/interface/package.json | 2 +- pkg/interface/src/views/apps/chat/components/lib/chat-editor.js | 2 +- .../src/views/apps/chat/components/lib/content/text.js | 1 - pkg/interface/src/views/apps/chat/css/custom.css | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/interface/package.json b/pkg/interface/package.json index 40c51cdd9..9826c946c 100644 --- a/pkg/interface/package.json +++ b/pkg/interface/package.json @@ -11,7 +11,7 @@ "@tlon/indigo-light": "^1.0.3", "@tlon/indigo-react": "^1.1.15", "classnames": "^2.2.6", - "codemirror": "^5.51.0", + "codemirror": "^5.55.0", "css-loader": "^3.5.3", "formik": "^2.1.4", "lodash": "^4.17.15", diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js index ee6dc4b6c..5b7cb962f 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js +++ b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js @@ -15,7 +15,7 @@ const MARKDOWN_CONFIG = { name: 'markdown', tokenTypeOverrides: { header: 'presentation', - quote: 'presentation', + quote: 'quote', list1: 'presentation', list2: 'presentation', list3: 'presentation', diff --git a/pkg/interface/src/views/apps/chat/components/lib/content/text.js b/pkg/interface/src/views/apps/chat/components/lib/content/text.js index 8ddda4ef8..0bc601122 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/content/text.js +++ b/pkg/interface/src/views/apps/chat/components/lib/content/text.js @@ -6,7 +6,6 @@ import urbitOb from 'urbit-ob'; const DISABLED_BLOCK_TOKENS = [ 'indentedCode', - 'blockquote', 'atxHeading', 'thematicBreak', 'list', diff --git a/pkg/interface/src/views/apps/chat/css/custom.css b/pkg/interface/src/views/apps/chat/css/custom.css index 7f7f4b9f7..37fea024b 100644 --- a/pkg/interface/src/views/apps/chat/css/custom.css +++ b/pkg/interface/src/views/apps/chat/css/custom.css @@ -258,7 +258,6 @@ blockquote { .chat .CodeMirror.cm-s-code.chat .cm-s-tlon * { font-family: 'Source Code Pro'; - } .chat .CodeMirror-selected { background:#BAE3FE !important; color: black; } @@ -267,6 +266,7 @@ pre.CodeMirror-placeholder.CodeMirror-line-like { color: var(--gray); } .chat .cm-s-tlon span { font-family: "Inter"} .chat .cm-s-tlon span.cm-meta { color: var(--gray); } .chat .cm-s-tlon span.cm-number { color: var(--gray); } +.chat .cm-s-tlon span.cm-quote { color: var(--gray); } .chat .cm-s-tlon span.cm-keyword { line-height: 1em; font-weight: bold; color: var(--gray); } .chat .cm-s-tlon span.cm-atom { font-weight: bold; color: var(--gray); } .chat .cm-s-tlon span.cm-def { color: black; }