Merge branch 'add_exo2_font'

This commit is contained in:
Brooke 2024-05-29 14:01:09 -07:00
commit c11734914a
No known key found for this signature in database
GPG key ID: 56C4CCAEB8BD5307
11 changed files with 35 additions and 6 deletions

27
sass/font-exo2.scss Normal file
View file

@ -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;
}

View file

@ -13,8 +13,8 @@ html {
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; font-family: Exo2, Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace;
font-size: 1rem; font-size: 1.25rem;
line-height: 1.54; line-height: 1.54;
background-color: var(--background); background-color: var(--background);
color: var(--color); color: var(--color);
@ -120,14 +120,13 @@ figure {
code { code {
font-family: Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace; font-family: Hack, DejaVu Sans Mono, Monaco, Consolas, Ubuntu Mono, monospace;
font-feature-settings: normal; font-feature-settings: normal;
background: var(--accent-alpha-20);
padding: 1px 6px; padding: 1px 6px;
margin: 0 2px; margin: 0 2px;
font-size: .95rem; font-size: 1rem;
} }
pre { 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; padding: 20px;
font-size: .95rem; font-size: .95rem;
overflow: auto; overflow: auto;

BIN
static/fonts/Exo2-Bold.woff Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -19,7 +19,10 @@
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}
{%- if config.extra.use_full_hack_font %} {%- if config.extra.use_full_hack_font == "exo2" %}
<link rel="stylesheet" href="{{ get_url(path="font-exo2.css", trailing_slash=false) | safe }}">
<link rel="stylesheet" href="{{ get_url(path="font-hack.css", trailing_slash=false) | safe }}">
{%- elif config.extra.use_full_hack_font %}
<link rel="stylesheet" href="{{ get_url(path="font-hack.css", trailing_slash=false) | safe }}"> <link rel="stylesheet" href="{{ get_url(path="font-hack.css", trailing_slash=false) | safe }}">
{% else %} {% else %}
<link rel="stylesheet" href="{{ get_url(path="font-hack-subset.css", trailing_slash=false) | safe }}"> <link rel="stylesheet" href="{{ get_url(path="font-hack-subset.css", trailing_slash=false) | safe }}">