From 393a6a3cf65e34e2eee06ebde5ff6530249d9dd1 Mon Sep 17 00:00:00 2001 From: Utsob Roy Date: Mon, 6 Mar 2023 17:09:41 +0600 Subject: [PATCH 1/4] migrate to lucide from fontawesome --- src/site/_includes/components/calloutScript.njk | 6 ------ src/site/_includes/components/filetree.njk | 5 ++--- src/site/_includes/components/filetreeNavbar.njk | 2 +- src/site/_includes/components/graphScript.njk | 7 ++++++- src/site/_includes/components/lucideIcons.njk | 7 +++++++ src/site/_includes/components/pageheader.njk | 1 - src/site/_includes/components/searchButton.njk | 2 +- src/site/_includes/components/searchContainer.njk | 4 ++-- src/site/_includes/components/sidebar.njk | 8 ++++---- src/site/_includes/layouts/index.njk | 1 + src/site/_includes/layouts/note.njk | 1 + src/site/styles/digital-garden-base.scss | 4 ++++ 12 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 src/site/_includes/components/lucideIcons.njk diff --git a/src/site/_includes/components/calloutScript.njk b/src/site/_includes/components/calloutScript.njk index 21f6213..a95651c 100644 --- a/src/site/_includes/components/calloutScript.njk +++ b/src/site/_includes/components/calloutScript.njk @@ -21,12 +21,6 @@ } }); - lucide.createIcons({ - attrs: { - class: ["svg-icon"] - } - }); - // Collapse callouts Array.from(document.querySelectorAll(".callout.is-collapsible")).forEach((elem) => { elem.querySelector('.callout-title').addEventListener("click", (event) => { diff --git a/src/site/_includes/components/filetree.njk b/src/site/_includes/components/filetree.njk index 7a6c8ab..074c942 100644 --- a/src/site/_includes/components/filetree.njk +++ b/src/site/_includes/components/filetree.njk @@ -3,14 +3,13 @@ @@ -62,7 +62,7 @@ {%- for backlink in graph.nodes[graph.homeAlias].backLinks -%} {%- if graph.nodes[backlink].url != graph.homeAlias -%}
- {{graph.nodes[backlink].title}} + {{graph.nodes[backlink].title}}
{%- endif -%} {%- endfor -%} @@ -75,7 +75,7 @@ {%- for backlink in graph.nodes[page.url].backLinks -%} {%- if graph.nodes[backlink].url != page.url -%}
- {{graph.nodes[backlink].title}} + {{graph.nodes[backlink].title}}
{%- endif -%} {%- endfor -%} diff --git a/src/site/_includes/layouts/index.njk b/src/site/_includes/layouts/index.njk index 25eeacc..ea65f93 100644 --- a/src/site/_includes/layouts/index.njk +++ b/src/site/_includes/layouts/index.njk @@ -74,5 +74,6 @@ {% for imp in dynamics.index.footer %} {% include imp %} {% endfor %} + {%include "components/lucideIcons.njk"%} diff --git a/src/site/_includes/layouts/note.njk b/src/site/_includes/layouts/note.njk index a69c075..c2d391b 100644 --- a/src/site/_includes/layouts/note.njk +++ b/src/site/_includes/layouts/note.njk @@ -80,5 +80,6 @@ permalink: "notes/{{ page.fileSlug | slugify }}/" {% for imp in dynamics.notes.footer %} {% include imp %} {% endfor %} + {%include "components/lucideIcons.njk"%} diff --git a/src/site/styles/digital-garden-base.scss b/src/site/styles/digital-garden-base.scss index 9e0ace0..cc47787 100644 --- a/src/site/styles/digital-garden-base.scss +++ b/src/site/styles/digital-garden-base.scss @@ -523,6 +523,10 @@ ul.task-list { &:hover { border: 1px solid var(--text-accent); } + + .search-icon { + display: flex; + } } .search-keys { From d241655dc846526f8cc3c62622a2d0eefb84d22a Mon Sep 17 00:00:00 2001 From: Utsob Roy Date: Mon, 6 Mar 2023 17:17:44 +0600 Subject: [PATCH 2/4] removed redaundant classes --- src/site/_includes/components/filetree.njk | 4 ++-- src/site/_includes/components/filetreeNavbar.njk | 2 +- src/site/_includes/components/graphScript.njk | 2 +- src/site/_includes/components/searchButton.njk | 2 +- src/site/_includes/components/searchContainer.njk | 4 ++-- src/site/_includes/components/sidebar.njk | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/site/_includes/components/filetree.njk b/src/site/_includes/components/filetree.njk index 074c942..79d02fd 100644 --- a/src/site/_includes/components/filetree.njk +++ b/src/site/_includes/components/filetree.njk @@ -8,8 +8,8 @@ {% elif fileOrFolder.isFolder%}
- - + + {{fileOrFolderName}}
{% for fileOrFolderName, child in fileOrFolder %} diff --git a/src/site/_includes/components/filetreeNavbar.njk b/src/site/_includes/components/filetreeNavbar.njk index bf9ca64..342f7a1 100644 --- a/src/site/_includes/components/filetreeNavbar.njk +++ b/src/site/_includes/components/filetreeNavbar.njk @@ -1,6 +1,6 @@
@@ -62,7 +62,7 @@ {%- for backlink in graph.nodes[graph.homeAlias].backLinks -%} {%- if graph.nodes[backlink].url != graph.homeAlias -%}
- {{graph.nodes[backlink].title}} + {{graph.nodes[backlink].title}}
{%- endif -%} {%- endfor -%} @@ -75,7 +75,7 @@ {%- for backlink in graph.nodes[page.url].backLinks -%} {%- if graph.nodes[backlink].url != page.url -%}
- {{graph.nodes[backlink].title}} + {{graph.nodes[backlink].title}}
{%- endif -%} {%- endfor -%} From f7b9ccd7b11091e575193c77223fb505a446bc0f Mon Sep 17 00:00:00 2001 From: Utsob Roy Date: Mon, 6 Mar 2023 23:00:10 +0600 Subject: [PATCH 3/4] Removed all google fonts (#96) * removed all google fonts * formatting fix * formatting fix --- src/site/404.njk | 5 +---- src/site/_includes/components/pageheader.njk | 3 --- src/site/styles/digital-garden-base.scss | 2 +- src/site/styles/obsidian-base.scss | 13 +++---------- src/site/styles/style.scss | 4 ++-- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/site/404.njk b/src/site/404.njk index 3cf553f..467b7fd 100644 --- a/src/site/404.njk +++ b/src/site/404.njk @@ -12,10 +12,7 @@ {%endif%} - - - - +
diff --git a/src/site/_includes/components/pageheader.njk b/src/site/_includes/components/pageheader.njk index a0d0cad..acb235f 100644 --- a/src/site/_includes/components/pageheader.njk +++ b/src/site/_includes/components/pageheader.njk @@ -32,9 +32,6 @@ {%- endfor -%} - - - {% favicon './src/site/favicon.svg' %} {% if metatags %} diff --git a/src/site/styles/digital-garden-base.scss b/src/site/styles/digital-garden-base.scss index cc47787..9188ca9 100644 --- a/src/site/styles/digital-garden-base.scss +++ b/src/site/styles/digital-garden-base.scss @@ -554,7 +554,7 @@ ul.task-list { } .callout { - font-family: "Roboto", sans-serif; + font-family: var(--font-default); word-wrap: break-word; display: block; font-size: 1rem; diff --git a/src/site/styles/obsidian-base.scss b/src/site/styles/obsidian-base.scss index 6240859..0db6129 100644 --- a/src/site/styles/obsidian-base.scss +++ b/src/site/styles/obsidian-base.scss @@ -606,13 +606,10 @@ body { --highlight-mix-blend-mode: darken; } } - - @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap'); - @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); - @import url('https://fonts.googleapis.com/css2?family=Flow+Circular&display=swap'); - + body { - --font-default: ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Inter", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Microsoft YaHei Light", sans-serif; + --font-default: ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + ; --font-monospace-default: Menlo, SFMono-Regular, Consolas, "Roboto Mono", 'Source Code Pro', monospace; --font-interface-override: '??'; --font-interface-theme: '??'; @@ -725,10 +722,6 @@ body { .app-container.no-transition * { transition: none !important; } - .app-container.is-text-garbled * { - font-family: 'Flow Circular', sans-serif !important; - line-height: 1.45em !important; - } .horizontal-main-container { width: 100%; display: flex; diff --git a/src/site/styles/style.scss b/src/site/styles/style.scss index 2aece8a..9817948 100644 --- a/src/site/styles/style.scss +++ b/src/site/styles/style.scss @@ -53,13 +53,13 @@ button { .theme-dark { background: var(--background-primary); color: var(--text-normal); - font-family: "Roboto", sans-serif; + font-family: var(--font-default); } .theme-light { background: white; color: black; - font-family: "Roboto", sans-serif; + font-family: var(--font-default); } a.is-unresolved { From 25c5ed93ab5aedb9db9119ce5ed7794057bcc482 Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Mon, 6 Mar 2023 20:10:21 +0100 Subject: [PATCH 4/4] Add back the sticky note icon as a default --- plugin-info.json | 1 + src/site/_includes/components/filetree.njk | 3 ++- src/site/styles/digital-garden-base.scss | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugin-info.json b/plugin-info.json index 28b8064..e7d16cc 100644 --- a/plugin-info.json +++ b/plugin-info.json @@ -46,6 +46,7 @@ "src/site/_includes/components/searchContainer.njk", "src/site/_includes/components/searchScript.njk", "src/site/_includes/components/calloutScript.njk", + "src/site/_includes/components/lucideIcons.njk", "src/site/lunr-index.js", "src/site/lunr.njk", "src/site/_data/versionednotes.js", diff --git a/src/site/_includes/components/filetree.njk b/src/site/_includes/components/filetree.njk index 79d02fd..0bd18b1 100644 --- a/src/site/_includes/components/filetree.njk +++ b/src/site/_includes/components/filetree.njk @@ -3,6 +3,7 @@ -
\ No newline at end of file + diff --git a/src/site/styles/digital-garden-base.scss b/src/site/styles/digital-garden-base.scss index 9188ca9..3019cb3 100644 --- a/src/site/styles/digital-garden-base.scss +++ b/src/site/styles/digital-garden-base.scss @@ -379,11 +379,16 @@ ul.task-list { .notelink { padding: 5px 0 5px 25px; + display: flex; + align-items: center; a { &:hover { text-decoration: underline !important; } } + svg { + flex-shrink: 0; + } } .foldername-wrapper {