diff --git a/src/frontend/apps/impress/cunningham.ts b/src/frontend/apps/impress/cunningham.ts index 8367cf1c..43b220b6 100644 --- a/src/frontend/apps/impress/cunningham.ts +++ b/src/frontend/apps/impress/cunningham.ts @@ -15,11 +15,6 @@ const config = { h5: '1rem', h6: '0.87rem', }, - weights: { - thin: 100, - extrabold: 800, - black: 900, - }, }, spacings: { '0': '0', diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff deleted file mode 100644 index 335e3488..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff2 b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff2 new file mode 100644 index 00000000..4a5b7b29 Binary files /dev/null and b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold.woff2 differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold_Italic.woff deleted file mode 100644 index 72878fca..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Bold_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold.woff deleted file mode 100644 index ad85a552..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold_Italic.woff deleted file mode 100644 index af92ea7c..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-ExtraBold_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Italic.woff2 b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Italic.woff2 new file mode 100644 index 00000000..30e8934e Binary files /dev/null and b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Italic.woff2 differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light.woff deleted file mode 100644 index 9ef49df3..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light_Italic.woff deleted file mode 100644 index 5ae0dbea..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Light_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium.woff deleted file mode 100644 index 692476eb..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium_Italic.woff deleted file mode 100644 index 8e32b88f..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Medium_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff deleted file mode 100644 index a95a2d04..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff2 b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff2 new file mode 100644 index 00000000..5d6517c8 Binary files /dev/null and b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular.woff2 differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular_Italic.woff deleted file mode 100644 index 1880c5d7..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Regular_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin.woff deleted file mode 100644 index 6c8bc5a0..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin_Italic.woff b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin_Italic.woff deleted file mode 100644 index 4c23d6b9..00000000 Binary files a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-Thin_Italic.woff and /dev/null differ diff --git a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-font.css b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-font.css index f8183f9e..117924ce 100644 --- a/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-font.css +++ b/src/frontend/apps/impress/src/assets/fonts/Marianne/Marianne-font.css @@ -1,77 +1,18 @@ @font-face { font-family: Marianne; - src: url('Marianne-Thin.woff') format('truetype'); - font-weight: 100; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Thin_Italic.woff') format('truetype'); - font-weight: 100; - font-style: italic; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Light.woff') format('truetype'); - font-weight: 300; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Light_Italic.woff') format('truetype'); - font-weight: 300; - font-style: italic; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Regular.woff') format('truetype'); + src: url('Marianne-Regular.woff2') format('woff2'); font-weight: 400; } @font-face { font-family: Marianne; - src: url('Marianne-Regular_Italic.woff') format('truetype'); + src: url('Marianne-Italic.woff2') format('woff2'); font-weight: 400; font-style: italic; } @font-face { font-family: Marianne; - src: url('Marianne-Medium.woff') format('truetype'); - font-weight: 500; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Medium_Italic.woff') format('truetype'); - font-weight: 500; - font-style: italic; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-Bold.woff') format('truetype'); + src: url('Marianne-Bold.woff2') format('woff2'); font-weight: 700; } - -@font-face { - font-family: Marianne; - src: url('Marianne-Bold_Italic.woff') format('truetype'); - font-weight: 700; - font-style: italic; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-ExtraBold.woff') format('truetype'); - font-weight: 800; -} - -@font-face { - font-family: Marianne; - src: url('Marianne-ExtraBold_Italic.woff') format('truetype'); - font-weight: 800; - font-style: italic; -}