Merge pull request #9 from piazzai/develop

Roll back variable font

_sass/_fonts.scss

@@ -1,27 +1,46 @@
-@font-face {
-  font-family: InterVariable;
-  font-style: normal;
-  font-weight: 100 900;
-  src: url("../fonts/InterVariable.woff2?v=4.0") format("woff2");
-}
+$weights: (
+  "Light": 300,
+  "Medium": 500,
+  "Bold": 700,
+);
 
-@font-face {
-  font-family: InterVariable;
-  font-style: italic;
-  font-weight: 100 900;
-  src: url("../fonts/InterVariable-Italic.woff2?v=4.0") format("woff2");
+$styles: (
+  normal: "",
+  italic: "Italic",
+);
+
+@each $style, $style-value in $styles {
+  @font-face {
+    font-family: "Zilla Slab";
+    font-display: block;
+    font-style: #{$style};
+    font-weight: 300;
+    src: url("../fonts/ZillaSlab-Light#{$style-value}.woff2") format("woff2");
+  }
+
+  @each $weight, $weight-value in $weights {
+    @font-face {
+      font-family: "Inter";
+      font-display: block;
+      font-style: #{$style};
+      font-weight: #{$weight-value};
+      src: url("../fonts/Inter-#{$weight}#{$style-value}.woff2") format("woff2");
+    }
+  }
 }
 
 @font-face {
-  font-family: "Zilla Slab";
+  font-family: "Inter";
+  font-display: block;
   font-style: normal;
-  font-weight: 300;
-  src: url("../fonts/ZillaSlab-Light.woff2") format("woff2");
+  font-weight: 400;
+  src: url("../fonts/Inter-Regular.woff2") format("woff2");
 }
 
 @font-face {
-  font-family: "Zilla Slab";
+  font-family: "Inter";
+  font-display: block;
   font-style: italic;
-  font-weight: 300;
-  src: url("../fonts/ZillaSlab-LightItalic.woff2") format("woff2");
-}
+  font-weight: 400;
+  src: url("../fonts/Inter-Italic.woff2") format("woff2");
+}

_sass/overrides/_bootstrap.scss

@@ -38,7 +38,7 @@ a {
 body {
   background-color: $body_bg;
   color: $body_color;
-  font-family: "InterVariable", var(--bs-font-sans-serif);
+  font-family: "Inter", var(--bs-font-sans-serif);
   font-size: 1.15rem;
 }
 

demo/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem 'jekyll-nagymaros', '~> 3.0'
+gem 'jekyll-nagymaros', '~> 3.1'

docs/assets/css/styles.css

@@ -1,23 +1,63 @@
-@font-face {
-  font-family: InterVariable;
-  font-style: normal;
-  font-weight: 100 900;
-  src: url("../fonts/InterVariable.woff2?v=4.0") format("woff2"); }
-@font-face {
-  font-family: InterVariable;
-  font-style: italic;
-  font-weight: 100 900;
-  src: url("../fonts/InterVariable-Italic.woff2?v=4.0") format("woff2"); }
 @font-face {
   font-family: "Zilla Slab";
+  font-display: block;
   font-style: normal;
   font-weight: 300;
   src: url("../fonts/ZillaSlab-Light.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: normal;
+  font-weight: 300;
+  src: url("../fonts/Inter-Light.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: normal;
+  font-weight: 500;
+  src: url("../fonts/Inter-Medium.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: normal;
+  font-weight: 700;
+  src: url("../fonts/Inter-Bold.woff2") format("woff2"); }
 @font-face {
   font-family: "Zilla Slab";
+  font-display: block;
   font-style: italic;
   font-weight: 300;
   src: url("../fonts/ZillaSlab-LightItalic.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: italic;
+  font-weight: 300;
+  src: url("../fonts/Inter-LightItalic.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: italic;
+  font-weight: 500;
+  src: url("../fonts/Inter-MediumItalic.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: italic;
+  font-weight: 700;
+  src: url("../fonts/Inter-BoldItalic.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: normal;
+  font-weight: 400;
+  src: url("../fonts/Inter-Regular.woff2") format("woff2"); }
+@font-face {
+  font-family: "Inter";
+  font-display: block;
+  font-style: italic;
+  font-weight: 400;
+  src: url("../fonts/Inter-Italic.woff2") format("woff2"); }
 .bg-gray-0 {
   --bs-bg-opacity: 1;
   background-color: rgba(var(--oc-gray-0-rgb), var(--bs-bg-opacity)) !important; }
@@ -1740,7 +1780,7 @@ a {
 body {
   background-color: var(--oc-gray-0);
   color: var(--oc-gray-8);
-  font-family: "InterVariable", var(--bs-font-sans-serif);
+  font-family: "Inter", var(--bs-font-sans-serif);
   font-size: 1.15rem; }
 
 .btn-close:focus {

docs/sitemap.xml

@@ -14,26 +14,26 @@
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/paper-1.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/paper-2.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-a.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-b.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-c.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 <url>
 <loc>https://piazzai.github.io/jekyll-nagymaros/assets/files/slides.pdf</loc>
-<lastmod>2024-09-07T23:11:56+02:00</lastmod>
+<lastmod>2024-09-07T23:36:21+02:00</lastmod>
 </url>
 </urlset>

jekyll-nagymaros.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-nagymaros"
-  spec.version       = "3.0.0"
+  spec.version       = "3.1.0"
   spec.authors       = ["piazzai"]
   spec.email         = ["[email protected]"]