diff --git a/_sass/_fonts.scss b/_sass/_fonts.scss index bd4d6db..8e89bb2 100644 --- a/_sass/_fonts.scss +++ b/_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"); -} \ No newline at end of file + font-weight: 400; + src: url("../fonts/Inter-Italic.woff2") format("woff2"); +} diff --git a/_sass/overrides/_bootstrap.scss b/_sass/overrides/_bootstrap.scss index a78ca4d..a506912 100644 --- a/_sass/overrides/_bootstrap.scss +++ b/_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; } diff --git a/assets/fonts/Inter-Bold.woff2 b/assets/fonts/Inter-Bold.woff2 new file mode 100644 index 0000000..2846f29 Binary files /dev/null and b/assets/fonts/Inter-Bold.woff2 differ diff --git a/assets/fonts/Inter-BoldItalic.woff2 b/assets/fonts/Inter-BoldItalic.woff2 new file mode 100644 index 0000000..0b1fe8e Binary files /dev/null and b/assets/fonts/Inter-BoldItalic.woff2 differ diff --git a/assets/fonts/Inter-Italic.woff2 b/assets/fonts/Inter-Italic.woff2 new file mode 100644 index 0000000..a619fc5 Binary files /dev/null and b/assets/fonts/Inter-Italic.woff2 differ diff --git a/assets/fonts/Inter-Light.woff2 b/assets/fonts/Inter-Light.woff2 new file mode 100644 index 0000000..bc4be66 Binary files /dev/null and b/assets/fonts/Inter-Light.woff2 differ diff --git a/assets/fonts/Inter-LightItalic.woff2 b/assets/fonts/Inter-LightItalic.woff2 new file mode 100644 index 0000000..842b2df Binary files /dev/null and b/assets/fonts/Inter-LightItalic.woff2 differ diff --git a/assets/fonts/Inter-Medium.woff2 b/assets/fonts/Inter-Medium.woff2 new file mode 100644 index 0000000..f92498a Binary files /dev/null and b/assets/fonts/Inter-Medium.woff2 differ diff --git a/assets/fonts/Inter-MediumItalic.woff2 b/assets/fonts/Inter-MediumItalic.woff2 new file mode 100644 index 0000000..0e3019f Binary files /dev/null and b/assets/fonts/Inter-MediumItalic.woff2 differ diff --git a/assets/fonts/Inter-Regular.woff2 b/assets/fonts/Inter-Regular.woff2 new file mode 100644 index 0000000..6c2b689 Binary files /dev/null and b/assets/fonts/Inter-Regular.woff2 differ diff --git a/assets/fonts/InterVariable-Italic.woff2 b/assets/fonts/InterVariable-Italic.woff2 deleted file mode 100644 index f22ec25..0000000 Binary files a/assets/fonts/InterVariable-Italic.woff2 and /dev/null differ diff --git a/assets/fonts/InterVariable.woff2 b/assets/fonts/InterVariable.woff2 deleted file mode 100644 index 22a12b0..0000000 Binary files a/assets/fonts/InterVariable.woff2 and /dev/null differ diff --git a/demo/Gemfile b/demo/Gemfile index 0374e9c..1731133 100644 --- a/demo/Gemfile +++ b/demo/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem 'jekyll-nagymaros', '~> 3.0' +gem 'jekyll-nagymaros', '~> 3.1' diff --git a/docs/assets/css/styles.css b/docs/assets/css/styles.css index 3396c3d..14aaa87 100644 --- a/docs/assets/css/styles.css +++ b/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 { diff --git a/docs/assets/fonts/Inter-Bold.woff2 b/docs/assets/fonts/Inter-Bold.woff2 new file mode 100644 index 0000000..2846f29 Binary files /dev/null and b/docs/assets/fonts/Inter-Bold.woff2 differ diff --git a/docs/assets/fonts/Inter-BoldItalic.woff2 b/docs/assets/fonts/Inter-BoldItalic.woff2 new file mode 100644 index 0000000..0b1fe8e Binary files /dev/null and b/docs/assets/fonts/Inter-BoldItalic.woff2 differ diff --git a/docs/assets/fonts/Inter-Italic.woff2 b/docs/assets/fonts/Inter-Italic.woff2 new file mode 100644 index 0000000..a619fc5 Binary files /dev/null and b/docs/assets/fonts/Inter-Italic.woff2 differ diff --git a/docs/assets/fonts/Inter-Light.woff2 b/docs/assets/fonts/Inter-Light.woff2 new file mode 100644 index 0000000..bc4be66 Binary files /dev/null and b/docs/assets/fonts/Inter-Light.woff2 differ diff --git a/docs/assets/fonts/Inter-LightItalic.woff2 b/docs/assets/fonts/Inter-LightItalic.woff2 new file mode 100644 index 0000000..842b2df Binary files /dev/null and b/docs/assets/fonts/Inter-LightItalic.woff2 differ diff --git a/docs/assets/fonts/Inter-Medium.woff2 b/docs/assets/fonts/Inter-Medium.woff2 new file mode 100644 index 0000000..f92498a Binary files /dev/null and b/docs/assets/fonts/Inter-Medium.woff2 differ diff --git a/docs/assets/fonts/Inter-MediumItalic.woff2 b/docs/assets/fonts/Inter-MediumItalic.woff2 new file mode 100644 index 0000000..0e3019f Binary files /dev/null and b/docs/assets/fonts/Inter-MediumItalic.woff2 differ diff --git a/docs/assets/fonts/Inter-Regular.woff2 b/docs/assets/fonts/Inter-Regular.woff2 new file mode 100644 index 0000000..6c2b689 Binary files /dev/null and b/docs/assets/fonts/Inter-Regular.woff2 differ diff --git a/docs/assets/fonts/InterVariable-Italic.woff2 b/docs/assets/fonts/InterVariable-Italic.woff2 deleted file mode 100644 index f22ec25..0000000 Binary files a/docs/assets/fonts/InterVariable-Italic.woff2 and /dev/null differ diff --git a/docs/assets/fonts/InterVariable.woff2 b/docs/assets/fonts/InterVariable.woff2 deleted file mode 100644 index 22a12b0..0000000 Binary files a/docs/assets/fonts/InterVariable.woff2 and /dev/null differ diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 5de518b..cf75fc8 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -14,26 +14,26 @@ https://piazzai.github.io/jekyll-nagymaros/assets/files/paper-1.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 https://piazzai.github.io/jekyll-nagymaros/assets/files/paper-2.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-a.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-b.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 https://piazzai.github.io/jekyll-nagymaros/assets/files/poster-c.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 https://piazzai.github.io/jekyll-nagymaros/assets/files/slides.pdf -2024-09-07T23:11:56+02:00 +2024-09-07T23:36:21+02:00 diff --git a/jekyll-nagymaros.gemspec b/jekyll-nagymaros.gemspec index df9c15d..0aa7452 100644 --- a/jekyll-nagymaros.gemspec +++ b/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 = ["42124135+piazzai@users.noreply.github.com"]