From 968333b8a53eee03a2148aab1166c3b381da61ba Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Sun, 12 Sep 2021 18:53:39 -0300
Subject: [PATCH] try and make fonts not jump around, fix dialog style
 overwriting main style, move prism css to main style

---
 projects/website/_layouts/default.html | 10 +--
 projects/website/assets/prism.css      | 88 --------------------------
 projects/website/assets/style.scss     | 77 ++++++++++++++++++++++
 3 files changed, 79 insertions(+), 96 deletions(-)
 delete mode 100644 projects/website/assets/prism.css

diff --git a/projects/website/_layouts/default.html b/projects/website/_layouts/default.html
index fab9cfb4..3c5c0d5c 100644
--- a/projects/website/_layouts/default.html
+++ b/projects/website/_layouts/default.html
@@ -16,7 +16,6 @@
         font-family: 'Fira Sans';
         font-style: normal;
         font-weight: normal;
-        font-display: fallback;
         src: url('/assets/FiraSans/Regular.woff2') format('woff2'),
              url('/assets/FiraSans/Regular.woff') format('woff');
       }
@@ -25,7 +24,6 @@
         font-family: 'Fira Sans';
         font-style: italic;
         font-weight: normal;
-        font-display: fallback;
         src: url('/assets/FiraSans/Italic.woff2') format('woff2'),
              url('/assets/FiraSans/Italic.woff') format('woff');
       }
@@ -34,7 +32,6 @@
         font-family: 'Fira Sans';
         font-style: normal;
         font-weight: bold;
-        font-display: fallback;
         src: url('/assets/FiraSans/Bold.woff2') format('woff2'),
              url('/assets/FiraSans/Bold.woff') format('woff');
       }
@@ -43,7 +40,6 @@
         font-family: 'Fira Sans';
         font-style: italic;
         font-weight: bold;
-        font-display: fallback;
         src: url('/assets/FiraSans/BoldItalic.woff2') format('woff2'),
              url('/assets/FiraSans/BoldItalic.woff') format('woff');
       }
@@ -52,16 +48,14 @@
         font-family: 'Fira Code';
         font-style: normal;
         font-weight: normal;
-        font-display: fallback;
         src: url('/assets/FiraCode/Regular.woff2') format('woff2'),
              url('/assets/FiraCode/Regular.woff') format('woff');
       }
     </style>
+    <link rel="stylesheet" href="/assets/imports/polyfills/dialog.css" />
     <link rel="stylesheet" href="/assets/imports/water.css" />
     <link rel="stylesheet" href="/assets/style.css" />
     <link rel="stylesheet" id="chosen-scheme" />
-    <link rel="stylesheet" href="/assets/imports/polyfills/dialog.css" />
-    <link rel="stylesheet" href="/assets/prism.css" />
     <script>
       let chosen_scheme_css = document.getElementById("chosen-scheme");
 
@@ -95,6 +89,6 @@
     {% include footer.html %}
     <script defer async src="/assets/main.js"></script>
     <script defer async src="/assets/imports/polyfills/dialog.js"></script>
-    <script defer async src="/assets/imports/prism.js"></script>
+    <script defer src="/assets/imports/prism.js"></script>
   </body>
 </html>
diff --git a/projects/website/assets/prism.css b/projects/website/assets/prism.css
deleted file mode 100644
index b50a8539..00000000
--- a/projects/website/assets/prism.css
+++ /dev/null
@@ -1,88 +0,0 @@
-/* PrismJS 1.23.0
- * Base16 colors
- * Based on default theme, based on dabblet (http://dabblet.com) */
-
-/* Code blocks */
-pre[class*="language-"] {
-	overflow: auto;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-	color: slategray;
-    color: var(--base03);
-}
-
-.token.punctuation {
-	color: #999;
-    color: var(--base04);
-}
-
-.token.namespace {
-	opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-	color: #905;
-    color: var(--base09);
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-	color: #690;
-    color: var(--base0E);
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-	color: #9a6e3a;
-    color: var(--base0B);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-	color: #07a;
-    color: var(--base0E);
-}
-
-.token.function,
-.token.class-name {
-	color: #DD4A68;
-    color: var(--base0D);
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-	color: #e90;
-    color: var(--base0C);
-}
-
-.token.important,
-.token.bold {
-	font-weight: bold;
-}
-.token.italic {
-	font-style: italic;
-}
-
-.token.entity {
-	cursor: help;
-}
-
diff --git a/projects/website/assets/style.scss b/projects/website/assets/style.scss
index ed34abcb..903af5e9 100644
--- a/projects/website/assets/style.scss
+++ b/projects/website/assets/style.scss
@@ -297,3 +297,80 @@ input:invalid {
 form {
   padding: 15px;
 }
+
+// PrismJS 1.23.0
+pre[class*="language-"] {
+  overflow: auto;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: var(--base03);
+}
+
+.token.punctuation {
+  color: var(--base04);
+}
+
+.token.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: var(--base09);
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: var(--base0E);
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: var(--base0B);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: var(--base0E);
+}
+
+.token.function,
+.token.class-name {
+  color: var(--base0D);
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: var(--base0C);
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}