PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

use Inter as font

Browse source
This commit is contained in:
Bruno Windels 2020-06-29 16:08:50 +02:00
parent baebab7b16
commit c0a9af945c
18 changed files with 64 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/fonts/Inter/Inter-Bold.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Bold.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-BoldItalic.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-BoldItalic.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Italic.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Italic.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Medium.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Medium.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-MediumItalic.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-MediumItalic.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Regular.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-Regular.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-SemiBold.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-SemiBold.woff2 Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-SemiBoldItalic.woff Normal file
View file

Binary file not shown.

BIN
res/fonts/Inter/Inter-SemiBoldItalic.woff2 Normal file
View file

Binary file not shown.

2
res/themes/element/css/_element.scss
View file

@ -8,7 +8,7 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing /* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out. digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */ TODO: Consider putting all emoji fonts to the end rather than the front. */
$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji'; $font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji'; $monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';

76
res/themes/element/css/_fonts.scss
View file

@ -14,23 +14,73 @@
/* the 'src' links are relative to the bundle.css, which is in a subdirectory. /* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/ */
@font-face { @font-face {
font-family: 'Nunito'; font-family: 'Inter';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype'); font-display: swap;
src: url("$(res)/fonts/Inter/Inter-Regular.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-Regular.woff?v=3.13") format("woff");
} }
@font-face { @font-face {
font-family: 'Nunito'; font-family: 'Inter';
font-style: normal; font-style: italic;
font-weight: 600; font-weight: 400;
src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype'); font-display: swap;
src: url("$(res)/fonts/Inter/Inter-Italic.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-Italic.woff?v=3.13") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
font-display: swap;
src: url("$(res)/fonts/Inter/Inter-Medium.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-Medium.woff?v=3.13") format("woff");
} }
@font-face { @font-face {
font-family: 'Nunito'; font-family: 'Inter';
font-style: normal; font-style: italic;
font-weight: 700; font-weight: 500;
src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype'); font-display: swap;
src: url("$(res)/fonts/Inter/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-MediumItalic.woff?v=3.13") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
font-display: swap;
src: url("$(res)/fonts/Inter/Inter-SemiBold.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-SemiBold.woff?v=3.13") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 600;
font-display: swap;
src: url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("$(res)/fonts/Inter/Inter-Bold.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-Bold.woff?v=3.13") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("$(res)/fonts/Inter/Inter-BoldItalic.woff2?v=3.13") format("woff2"),
url("$(res)/fonts/Inter/Inter-BoldItalic.woff?v=3.13") format("woff");
} }
/* latin-ext */ /* latin-ext */
@ -81,4 +131,4 @@
font-family: "Twemoji Mozilla"; font-family: "Twemoji Mozilla";
src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2'); src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
} }
*/ */