Merge pull request #3889 from omnivore-app/fix/web-notes-and-fonts

Fix notebook export, add Super Notes Pro font'
omnivore-app · May 2, 2024 · f11b7af · f11b7af
2 parents 9a62d11 + 6091ddd
commit f11b7af
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/packages/web/components/templates/article/NotebookHeader.tsx b/packages/web/components/templates/article/NotebookHeader.tsx
@@ -27,12 +27,24 @@ export const NotebookHeader = (props: NotebookHeaderProps) => {
 
   const exportHighlights = useCallback(() => {
     if (articleData?.article.article.highlights) {
-      const markdown = highlightsAsMarkdown(
+      let preamble = ''
+
+      if (articleData?.article.article.title) {
+        preamble += `## ${articleData?.article.article.title}\n`
+      }
+      if (
+        articleData?.article.article.contentReader == 'WEB' &&
+        articleData?.article.article.originalArticleUrl
+      ) {
+        preamble += `URL: ${articleData?.article.article.originalArticleUrl}\n`
+      }
+
+      const highlights = highlightsAsMarkdown(
         articleData?.article.article.highlights
       )
-      if (markdown.length > 1) {
+      if (preamble.length + highlights.length > 1) {
         ;(async () => {
-          await navigator.clipboard.writeText(markdown)
+          await navigator.clipboard.writeText(preamble + '\n\n' + highlights)
           showSuccessToast('Highlights and notes copied')
         })()
       } else {

diff --git a/packages/web/components/templates/article/ReaderSettingsControl.tsx b/packages/web/components/templates/article/ReaderSettingsControl.tsx
@@ -48,6 +48,7 @@ const FONT_FAMILIES = [
   'IBMPlexSans',
   'Fraunces',
   'Literata',
+  'SuperNotesPro',
 ]
 
 type SettingsProps = {

diff --git a/packages/web/public/static/fonts/SNPro/SNPro-Bold.woff b/packages/web/public/static/fonts/SNPro/SNPro-Bold.woff
diff --git a/packages/web/public/static/fonts/SNPro/SNPro-RegularItalic.otf b/packages/web/public/static/fonts/SNPro/SNPro-RegularItalic.otf
diff --git a/packages/web/public/static/fonts/SNPro/SNPro-VariableRegular.ttf b/packages/web/public/static/fonts/SNPro/SNPro-VariableRegular.ttf
diff --git a/packages/web/styles/globals.css b/packages/web/styles/globals.css
@@ -418,6 +418,28 @@ div#appleid-signin {
   src: url('/static/fonts/Literata/Literata-Italic.ttf');
 }
 
+@font-face {
+  font-family: 'SuperNotesPro';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/SNPro/SNPro-VariableRegular.ttf');
+}
+
+@font-face {
+  font-family: 'SuperNotesPro';
+  font-weight: 700;
+  font-style: bold;
+  src: url('/static/fonts/SNPro/SNPro-Bold.ttf');
+}
+
+
+@font-face {
+  font-family: 'SuperNotesPro';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/SNPro/SNPro-Italic.ttf');
+}
+
 @font-face {
   font-family: 'FuturaBold';
   src: url('/static/fonts/FuturaBold/FuturaBold.otf');