diff --git a/config.toml b/config.toml index cfcceca..9aaf037 100644 --- a/config.toml +++ b/config.toml @@ -6,10 +6,10 @@ title = "Zola Terminimal theme" compile_sass = true # The theme supports feeds (RSS and ATOM) -generate_feed = true +generate_feeds = true # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM. -feed_filename = "atom.xml" +feed_filenames = ["atom.xml"] # Optional: enable tags taxonomies = [ diff --git a/sass/font-exo2.scss b/sass/font-exo2.scss new file mode 100644 index 0000000..fe07f20 --- /dev/null +++ b/sass/font-exo2.scss @@ -0,0 +1,27 @@ +@font-face { + font-family: 'Exo2'; + src: url('fonts/Exo2-Regular.woff2?sha=123456789') format('woff2'), url('fonts/Exo2-Regular.woff?sha=123456789') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Exo2'; + src: url('fonts/Exo2-Bold.woff2?sha=123456789') format('woff2'), url('fonts/Exo2-Bold.woff?sha=123456789') format('woff'); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Exo2'; + src: url('fonts/Exo2-Italic.woff2?sha=123456789') format('woff2'), url('fonts/Exo2-Italic.woff?sha=123456789') format('woff'); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: 'Exo2'; + src: url('fonts/Exo2-BoldItalic.woff2?sha=123456789') format('woff2'), url('fonts/Exo2-BoldItalic.woff?sha=123456789') format('woff'); + font-weight: 700; + font-style: italic; +} diff --git a/sass/main.scss b/sass/main.scss index 453bc18..59de5ca 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -13,8 +13,8 @@ html { body { margin: 0; padding: 0; - font-family: Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; - font-size: 1rem; + font-family: Exo2, Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; + font-size: 1.25rem; line-height: 1.54; background-color: var(--background); color: var(--color); @@ -123,11 +123,11 @@ code { background: var(--accent-alpha-20); padding: 1px 6px; margin: 0 2px; - font-size: .95rem; + font-size: 1rem; } pre { - font-family: Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; + font-family: Exo2, Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; padding: 20px; font-size: .95rem; overflow: auto; diff --git a/static/fonts/Exo2-Bold.woff b/static/fonts/Exo2-Bold.woff new file mode 100644 index 0000000..4269979 Binary files /dev/null and b/static/fonts/Exo2-Bold.woff differ diff --git a/static/fonts/Exo2-Bold.woff2 b/static/fonts/Exo2-Bold.woff2 new file mode 100644 index 0000000..6d3fc6d Binary files /dev/null and b/static/fonts/Exo2-Bold.woff2 differ diff --git a/static/fonts/Exo2-BoldItalic.woff b/static/fonts/Exo2-BoldItalic.woff new file mode 100644 index 0000000..e2b49d3 Binary files /dev/null and b/static/fonts/Exo2-BoldItalic.woff differ diff --git a/static/fonts/Exo2-BoldItalic.woff2 b/static/fonts/Exo2-BoldItalic.woff2 new file mode 100644 index 0000000..c16f318 Binary files /dev/null and b/static/fonts/Exo2-BoldItalic.woff2 differ diff --git a/static/fonts/Exo2-Italic.woff b/static/fonts/Exo2-Italic.woff new file mode 100644 index 0000000..abbca29 Binary files /dev/null and b/static/fonts/Exo2-Italic.woff differ diff --git a/static/fonts/Exo2-Italic.woff2 b/static/fonts/Exo2-Italic.woff2 new file mode 100644 index 0000000..954cdc8 Binary files /dev/null and b/static/fonts/Exo2-Italic.woff2 differ diff --git a/static/fonts/Exo2-Regular.woff b/static/fonts/Exo2-Regular.woff new file mode 100644 index 0000000..a8ee1ec Binary files /dev/null and b/static/fonts/Exo2-Regular.woff differ diff --git a/static/fonts/Exo2-Regular.woff2 b/static/fonts/Exo2-Regular.woff2 new file mode 100644 index 0000000..1a05321 Binary files /dev/null and b/static/fonts/Exo2-Regular.woff2 differ diff --git a/templates/index.html b/templates/index.html index 8b67c98..f31f29b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -13,17 +13,25 @@ {%- block open_graph %}{{ head_macros::open_graph(config=config) }}{% endblock open_graph -%} - {%- if config.generate_feed %} - {%- if "rss" in config.feed_filename %} - {% set feed_type = 'rss+xml' %} - {%- else %} - {% set feed_type = 'atom+xml' %} - {% endif -%} - + {%- if config.generate_feeds %} + {%- for feed in config.feed_filenames %} + + {%- if feed is containing('atom') %} + + {%- endif %} + + {%- if feed is containing('rss') %} + + {%- endif %} + + {%- endfor %} {% endif -%} {%- if config.extra.favicon %} - + + + + {% endif -%} {%- block extra_head %} diff --git a/templates/macros/head.html b/templates/macros/head.html index d882e0c..4344198 100644 --- a/templates/macros/head.html +++ b/templates/macros/head.html @@ -19,7 +19,10 @@ {% endif -%} {% endif -%} -{%- if config.extra.use_full_hack_font %} +{%- if config.extra.use_full_hack_font == "exo2" %} + + +{%- elif config.extra.use_full_hack_font %} {% else %}