improve fonts

2023-01-03 00:45:12 +00:00 · 2023-01-03 00:45:12 +00:00 · 10e72e0b35
commit 10e72e0b35
parent ff112713f9
16 changed files with 136 additions and 83 deletions
--- a/assets/_amethyst.scss
+++ b/assets/_amethyst.scss
@ -68,6 +68,11 @@ header {
    height: 16px;
 }

+pre::-webkit-scrollbar {
+    width: 8px;
+    height: 10px;
+}
+
 *::-webkit-scrollbar-thumb {
    background: grey;
    border-radius: 8px;
@ -78,3 +83,18 @@ header {
    // background: linear-gradient(90deg,#434343,#434343 1px,#111 0,#111);
    background-color: #DDD;
 }
+
+.markdown h1, .markdown h2, .markdown h3 {
+    font-weight: bold;
+}
+
+.markdown p {
+    color: #222;
+    font-weight: 500;
+}
+
+.title {
+    color: blue;
+    font-size: 3rem;
+    padding-bottom: 1rem;
+}
--- a/assets/_defaults.scss
+++ b/assets/_defaults.scss
@ -14,11 +14,11 @@ $border-radius: $padding-4 !default;
 $body-font-weight: normal !default;

 $body-min-width: 20rem !default;
-$container-max-width: 80rem !default;
+$container-max-width: 65rem !default;

 $header-height: 3.5rem !default;
 $menu-width: 16rem !default;
-$toc-width: 16rem !default;
+$toc-width: 12rem !default;

 $mobile-breakpoint: $menu-width + $body-min-width * 1.2 + $toc-width !default;

--- a/assets/_fonts.scss
+++ b/assets/_fonts.scss
@ -1,39 +1,71 @@
-/* roboto-regular - latin */
@font-face {
-  font-family: 'Roboto';
+  font-family: "PP Mori";
  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: local(''),
-       url('fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('fonts/roboto-v27-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-/* roboto-700 - latin */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 700;
-  font-display: swap;
-  src: local(''),
-       url('fonts/roboto-v27-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('fonts/roboto-v27-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-weight: normal;
+  src: url('fonts/PPMori-SemiBold.woff2');
 }

-/* roboto-mono-regular - latin */
@font-face {
-  font-family: 'Roboto Mono';
+  font-family: "PP Mori";
  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: local(''),
-       url('fonts/roboto-mono-v13-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('fonts/roboto-mono-v13-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-weight: lighter;
+  src: url('fonts/PPMori-Book.woff2');
 }

-body {
-  font-family: 'Roboto', sans-serif;
+@font-face {
+  font-family: "PP Mori";
+  font-style: normal;
+  font-weight: bold;
+  src: url('fonts/PPMori-ExtraBold.woff2');
 }

-code {
-  font-family: 'Roboto Mono', monospace;
+@font-face {
+  font-family: "PP Mori";
+  font-style: italic;
+  font-weight: normal;
+  src: url('fonts/PPMori-RegularItalic.woff2');
+}
+
+@font-face {
+  font-family: "PP Mori";
+  font-style: italic;
+  font-weight: bold;
+  src: url('fonts/PPMori-SemiBoldItalic.woff2');
+}
+
+
+
+@font-face {
+  font-family: "PP Fraktion Mono";
+  font-style: normal;
+  font-weight: normal;
+  src: url('fonts/PPFraktionMono-Regular.woff2');
+}
+
+@font-face {
+  font-family: "PP Fraktion Mono";
+  font-style: normal;
+  font-weight: lighter;
+  src: url('fonts/PPFraktionMono-Light.woff2');
+}
+
+@font-face {
+  font-family: "PP Fraktion Mono";
+  font-style: normal;
+  font-weight: bold;
+  src: url('fonts/PPFraktionMono-Bold.woff2');
+}
+
+@font-face {
+  font-family: "PP Fraktion Mono";
+  font-style: italic;
+  font-weight: normal;
+  src: url('fonts/PPFraktionMono-RegularItalic.woff2');
+}
+
+@font-face {
+  font-family: "PP Fraktion Mono";
+  font-style: italic;
+  font-weight: bold;
+  src: url('fonts/PPFraktionMono-BoldItalic.woff2');
 }
--- a/assets/indices/contentIndex.json
+++ b/assets/indices/contentIndex.json
--- a/assets/quartz/styles/base.scss
+++ b/assets/quartz/styles/base.scss
@ -1,9 +1,9 @@
 // Replace this with your own font imports!
-@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;700&family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;700&family=Source+Sans+Pro:wght@400;600&display=swap');
 :root {
-  --font-body: "Source Sans Pro";
-  --font-header: "Inter";
-  --font-mono: "Fira Code"
+  --font-body: "PP Mori", "Source Sans Pro", sans-serif;
+  --font-header: "PP Mori", "Source Sans Pro", sans-serif;
+  --font-mono: "PP Fraktion Mono", "Fira Code", monospace;
 }

 // typography
--- a/config.yaml
+++ b/config.yaml
@ -1,6 +1,4 @@
 # hugo server --minify --themesDir ... --baseURL=http://0.0.0.0:1313/theme/hugo-book/
-
-name: Ben Cuan
 baseURL: https://notes.bencuan.me

 # Book configuration
@ -32,6 +30,7 @@ menu:

 params:

+  name: Ben Cuan
  title: 📓 Ben's Notes

  # OPTIONAL: custom favicon location
@ -134,7 +133,7 @@ params:

  # /!\ This is an experimental feature, might be removed or changed at any time
  # (Optional, experimental, default false) Enables service worker that caches visited pages and resources for offline use.
-  BookServiceWorker: true
+  BookServiceWorker: false

  # /!\ This is an experimental feature, might be removed or changed at any time
  # (Optional, experimental, default false) Enables a drop-down menu for translations only if a translation is present.
--- a/content/docs/example/table-of-contents/_index.md
+++ b/content/docs/example/table-of-contents/_index.md
@ -1,5 +1,6 @@
 ---
 weight: 10
+title: "Table of Contents"
 ---

 # Ubi loqui
--- a/content/notes/hosting.md
+++ b/content/notes/hosting.md
@ -2,7 +2,6 @@
 title: "Deploying Quartz to the Web"
 tags:
 - setup
-weight: -1
 aliases:
 - hosting
 ---
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -76,6 +76,7 @@

 {{ define "main" }}
  <article class="markdown">
+    <h1 class="title">{{ partial "docs/title.html" . }}</h1>
    {{partial "quartz/textprocessing" . }}
    {{ partial "quartz/footer"}}
    {{/*  {{- .Content -}}  */}}
--- a/layouts/partials/quartz/contact.html
+++ b/layouts/partials/quartz/contact.html
@ -1,17 +1,17 @@
 <!-- set data/config yaml file based on website language -->
 {{ $config := cond (eq $.Site.Language.Lang "en") "config" (printf "config.%s" $.Site.Language.Lang) }}
-{{ $data := index $.Site.Data $config }}
+{{ $data := $.Site.Params }}
 <!-- Contact Info -->
 <div id="contact_buttons">
    <footer>
-        {{ $name := $data.name | default $.Site.name }}
+        {{ $name := $data.name | default $.Site.Pkarams.name }}
        {{ $year := dateFormat "2006" now }}
        <p>{{ i18n "copyright" (dict "name" $name "year" $year) | safeHTML}}</p>
        <ul>
            {{ if not .IsHome }}
            <li><a href="{{ $.Site.BaseURL}}">{{ i18n "home" }}</a></li>
            {{end}}
-            {{- range $data.links | default $.Site.params.links -}}
+            {{- range $data.links | default $.Site.Params.links -}}
            <li><a href="{{.link}}">{{.link_name}}</a></li>
            {{- end -}}
        </ul>
--- a/layouts/partials/quartz/footer.html
+++ b/layouts/partials/quartz/footer.html
@ -13,4 +13,4 @@
 </div>
 {{/*  {{end}}  */}}

-{{partial "quartz/contact.html" .}}
+{{partial "quartz/contact" .}}
--- a/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.content
+++ b/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.content
--- a/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.json
+++ b/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.json
@ -1 +1 @@
-{"Target":"book.min.c3712169596a922d55634c121e69fc0c686df20d0cc71ff7d2bc271b07e2e0cd.css","MediaType":"text/css","Data":{"Integrity":"sha256-w3EhaVlqki1VY0wSHmn8DGht8g0Mxx/30rwnGwfi4M0="}}
+{"Target":"book.min.2ed75c0ce1bf358603ecfc1ad2de2c5bb8201d25551cf85f59fc45436d1dba91.css","MediaType":"text/css","Data":{"Integrity":"sha256-LtdcDOG/NYYD7Pwa0t4sW7ggHSVVHPhfWfxFQ20dupE="}}
--- a/resources/_gen/assets/scss/quartz/styles/base.scss_0ccffbd39a5ea808aa33646cb7c2a662.content
+++ b/resources/_gen/assets/scss/quartz/styles/base.scss_0ccffbd39a5ea808aa33646cb7c2a662.content
--- a/static/fonts/.gitignore
+++ b/static/fonts/.gitignore
@ -0,0 +1,2 @@
+PP*.woff2
+PP*.ttf
--- a/static/linkmap
+++ b/static/linkmap
@ -1,44 +1,44 @@
-/index.html /
 /docs/shortcodes/buttons/index.{html} /docs/shortcodes/buttons/
-/docs/shortcodes/tabs/index.{html} /docs/shortcodes/tabs/
-/notes/CJK-+-Latex-Support-%E6%B5%8B%E8%AF%95/index.{html} /notes/CJK-+-Latex-Support-%E6%B5%8B%E8%AF%95/
 /notes/docker/index.{html} /notes/docker/
-/notes/obsidian/index.{html} /notes/obsidian/
-/docs/shortcodes/section/second-page/index.{html} /docs/shortcodes/section/second-page/
-/menu/index.{html} /menu/
-/notes/custom-Domain/index.{html} /notes/custom-Domain/
-/posts//index.{html} /posts//
-/docs/shortcodes//index.{html} /docs/shortcodes//
-/docs/shortcodes/columns/index.{html} /docs/shortcodes/columns/
-/posts/goisforlovers/index.{html} /posts/goisforlovers/
-/docs/example/collapsed/3rd-level//index.{html} /docs/example/collapsed/3rd-level//
-/docs/shortcodes/mermaid/index.{html} /docs/shortcodes/mermaid/
-/docs/shortcodes/section/first-page/index.{html} /docs/shortcodes/section/first-page/
-/notes/hosting/index.{html} /notes/hosting/
-/notes/philosophy/index.{html} /notes/philosophy/
-/notes/preview-changes/index.{html} /notes/preview-changes/
 /notes/setup/index.{html} /notes/setup/
+/posts/creating-a-new-theme/index.{html} /posts/creating-a-new-theme/
 /posts/hugoisforlovers/index.{html} /posts/hugoisforlovers/
-/docs/example/collapsed//index.{html} /docs/example/collapsed//
-/docs/example/hidden/index.{html} /docs/example/hidden/
 /docs/example/table-of-contents//index.{html} /docs/example/table-of-contents//
-/docs/shortcodes/expand/index.{html} /docs/shortcodes/expand/
+/docs/shortcodes/hints/index.{html} /docs/shortcodes/hints/
 /docs/shortcodes/katex/index.{html} /docs/shortcodes/katex/
-/notes/search/index.{html} /notes/search/
-/docs/example/collapsed/3rd-level/4th-level/index.{html} /docs/example/collapsed/3rd-level/4th-level/
-/docs/example/table-of-contents/with-toc/index.{html} /docs/example/table-of-contents/with-toc/
-/notes/showcase/index.{html} /notes/showcase/
+/docs/shortcodes/mermaid/index.{html} /docs/shortcodes/mermaid/
+/docs/shortcodes/section/second-page/index.{html} /docs/shortcodes/section/second-page/
+/notes/editing/index.{html} /notes/editing/
+/notes/obsidian/index.{html} /notes/obsidian/
 /posts/migrate-from-jekyll/index.{html} /posts/migrate-from-jekyll/
 /docs/example//index.{html} /docs/example//
-/docs/example/table-of-contents/without-toc/index.{html} /docs/example/table-of-contents/without-toc/
-/notes/config/index.{html} /notes/config/
-/notes/ignore-notes/index.{html} /notes/ignore-notes/
-/notes/troubleshooting/index.{html} /notes/troubleshooting/
-/posts/creating-a-new-theme/index.{html} /posts/creating-a-new-theme/
-/docs/shortcodes/details/index.{html} /docs/shortcodes/details/
-/docs/shortcodes/hints/index.{html} /docs/shortcodes/hints/
+/docs/example/hidden/index.{html} /docs/example/hidden/
+/docs/shortcodes/columns/index.{html} /docs/shortcodes/columns/
 /docs/shortcodes/section//index.{html} /docs/shortcodes/section//
-/notes//index.{html} /notes//
+/docs/shortcodes/section/first-page/index.{html} /docs/shortcodes/section/first-page/
+/notes/config/index.{html} /notes/config/
+/notes/custom-Domain/index.{html} /notes/custom-Domain/
+/notes/philosophy/index.{html} /notes/philosophy/
+/index.html /
+/docs/example/collapsed//index.{html} /docs/example/collapsed//
+/docs/example/table-of-contents/with-toc/index.{html} /docs/example/table-of-contents/with-toc/
 /notes/callouts/index.{html} /notes/callouts/
-/notes/editing/index.{html} /notes/editing/
+/notes/hosting/index.{html} /notes/hosting/
+/posts/goisforlovers/index.{html} /posts/goisforlovers/
+/docs/shortcodes//index.{html} /docs/shortcodes//
+/notes/CJK-+-Latex-Support-%E6%B5%8B%E8%AF%95/index.{html} /notes/CJK-+-Latex-Support-%E6%B5%8B%E8%AF%95/
+/notes/ignore-notes/index.{html} /notes/ignore-notes/
+/docs/example/collapsed/3rd-level/4th-level/index.{html} /docs/example/collapsed/3rd-level/4th-level/
+/docs/example/collapsed/3rd-level//index.{html} /docs/example/collapsed/3rd-level//
+/docs/shortcodes/tabs/index.{html} /docs/shortcodes/tabs/
+/notes/search/index.{html} /notes/search/
+/docs/shortcodes/details/index.{html} /docs/shortcodes/details/
+/docs/shortcodes/expand/index.{html} /docs/shortcodes/expand/
+/menu/index.{html} /menu/
+/notes/preview-changes/index.{html} /notes/preview-changes/
+/notes/troubleshooting/index.{html} /notes/troubleshooting/
+/posts//index.{html} /posts//
+/docs/example/table-of-contents/without-toc/index.{html} /docs/example/table-of-contents/without-toc/
+/notes//index.{html} /notes//
+/notes/showcase/index.{html} /notes/showcase/
 /notes/updating/index.{html} /notes/updating/