From 4f5feb47a59914201ee78d106fd60cf97a9bd866 Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Sun, 14 Nov 2021 11:25:03 -0500
Subject: [PATCH] style updates

---
 assets/sass/abstracts/_settings.scss   | 8 ++++----
 assets/sass/abstracts/_themes.scss     | 4 ++--
 assets/sass/abstracts/_typography.scss | 9 +++++----
 assets/sass/components/_global.scss    | 4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/sass/abstracts/_settings.scss b/assets/sass/abstracts/_settings.scss
index 565c3b6b..06be0e84 100644
--- a/assets/sass/abstracts/_settings.scss
+++ b/assets/sass/abstracts/_settings.scss
@@ -23,13 +23,13 @@ $webfont-unicode-latin-only: (
 // https://markdotto.com/2018/02/07/github-system-fonts/
 // stylelint-disable-next-line value-keyword-case
 $system-fonts-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif;
-$system-fonts-monospace: ui-monospace, "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", "Courier", monospace;
+$system-fonts-mono: ui-monospace, "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", "Courier", monospace;
 
 // Prefer web fonts with system fonts as backup:
 $font-stack-sans: list.join($webfont-sans, $system-fonts-sans);
-$font-stack-variable: list.join($webfont-sans-variable, $system-fonts-sans);
-$font-stack-mono: list.join($webfont-mono, $system-fonts-monospace);
-$font-stack-mono-variable: list.join($webfont-mono-variable, $system-fonts-monospace);
+$font-stack-sans-variable: list.join($webfont-sans-variable, $font-stack-sans);
+$font-stack-mono: list.join($webfont-mono, $system-fonts-mono);
+$font-stack-mono-variable: list.join($webfont-mono-variable, $font-stack-mono);
 
 // Fancy link underline settings:
 $link-underline-opacity: 40%;
diff --git a/assets/sass/abstracts/_themes.scss b/assets/sass/abstracts/_themes.scss
index c8032bf0..8e658d76 100644
--- a/assets/sass/abstracts/_themes.scss
+++ b/assets/sass/abstracts/_themes.scss
@@ -6,7 +6,7 @@
 // Takes a map of CSS properties and theme keys (see below) and set both body.light and body.dark selectors.
 // ex. @include themes.themed((color: "text", background-color: "background-inner"));
 // Also accepts additional transitions (in shorthand) to tack on.
-@mixin themed($properties, $addTransitions: ()) {
+@mixin themed($properties, $moreTransitions: ()) {
   // generate CSS transition shorthand for each themed property w/ default duration and function
   $defaults: ();
   @each $property, $color in $properties {
@@ -15,7 +15,7 @@
   }
 
   // list all transitions separated by commas (with additional shorthand(s) passed in)
-  transition: list.join($addTransitions, $defaults, $separator: comma);
+  transition: list.join($moreTransitions, $defaults, $separator: comma);
 
   // keep track of the original selector(s) calling this mixin for below
   $selectors: #{&};
diff --git a/assets/sass/abstracts/_typography.scss b/assets/sass/abstracts/_typography.scss
index 0f910883..52b30503 100644
--- a/assets/sass/abstracts/_typography.scss
+++ b/assets/sass/abstracts/_typography.scss
@@ -8,8 +8,9 @@
  * Inter typeface - https://rsms.me/inter/
  *
  * Copyright (c) 2016-2020 The Inter Project Authors.
+ * "Inter" is trademark of Rasmus Andersson.
  * Licensed under the SIL Open Font License, Version 1.1:
- * https://github.com/rsms/inter/blob/master/LICENSE.txt
+ * https://scripts.sil.org/OFL
  */
 
 // Variable
@@ -25,11 +26,11 @@
 @include Inter.fontFace($fontName: "Inter", $weight: 700, $unicodeMap: settings.$webfont-unicode-latin-only);
 
 /*!
- * Roboto Mono typeface - https://fonts.google.com/specimen/Roboto+Mono
+ * Roboto Mono typeface - https://github.com/googlefonts/robotomono
  *
  * Copyright (c) 2015 The Roboto Mono Project Authors.
  * Licensed under the Apache License, Version 2.0:
- * https://github.com/google/fonts/blob/main/apache/robotomono/LICENSE.txt
+ * https://www.apache.org/licenses/LICENSE-2.0
  */
 
 // Variable
@@ -50,7 +51,7 @@
  *
  * Copyright (c) 2014 The Comic Neue Project Authors.
  * Licensed under the SIL Open Font License, Version 1.1:
- * https://github.com/crozynski/comicneue/blob/master/OFL.txt
+ * https://scripts.sil.org/OFL
  */
 
 @include ComicNeue.fontFace($fontName: "Comic Neue", $weight: 400, $unicodeMap: settings.$webfont-unicode-latin-only);
diff --git a/assets/sass/components/_global.scss b/assets/sass/components/_global.scss
index a3256301..45b1436d 100644
--- a/assets/sass/components/_global.scss
+++ b/assets/sass/components/_global.scss
@@ -46,7 +46,7 @@ pre,
 // https://caniuse.com/#feat=variable-fonts
 @supports (font-variation-settings: normal) {
   body {
-    font-family: settings.$font-stack-variable;
+    font-family: settings.$font-stack-sans-variable;
     font-optical-sizing: auto;
   }
 
@@ -104,7 +104,7 @@ main {
       $properties: (
         color: "links",
       ),
-      $addTransitions: (
+      $moreTransitions: (
         background-size 0.25s ease-in-out,
       )
     );