diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 48a15647f5b85e00ace6ce69488677c4407189ca..def1ab15bf6580612238bb33512a6fc8cc20e983 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -99,6 +99,7 @@
"@react-aria/utils": "^3.13.3",
"@react-stately/collections": "^3.4.3",
"@react-stately/list": "^3.5.3",
+ "inter-ui": "^3.19.3",
"react-router-dom-v5-compat": "^6.4.1"
}
}
diff --git a/packages/desktop-client/public/Inter/Inter-Black.woff2 b/packages/desktop-client/public/Inter/Inter-Black.woff2
deleted file mode 100644
index b16b995beeae3b37f73edf15e05dc9558d94ac82..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Black.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-BlackItalic.woff2 b/packages/desktop-client/public/Inter/Inter-BlackItalic.woff2
deleted file mode 100644
index a3f1b70cdf14e700f28b3d9b4c3babc77194ebef..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-BlackItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Bold.woff2 b/packages/desktop-client/public/Inter/Inter-Bold.woff2
deleted file mode 100644
index 835dd4977a0fccce1c87e11433abe38c825f3e5d..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Bold.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-BoldItalic.woff2 b/packages/desktop-client/public/Inter/Inter-BoldItalic.woff2
deleted file mode 100644
index 1a41a14ff1f2c427d1742dead3d1df8c905156e2..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-BoldItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-ExtraBold.woff2 b/packages/desktop-client/public/Inter/Inter-ExtraBold.woff2
deleted file mode 100644
index ae956b1501f68c11399174b433741a5948eef53d..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-ExtraBold.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-ExtraBoldItalic.woff2 b/packages/desktop-client/public/Inter/Inter-ExtraBoldItalic.woff2
deleted file mode 100644
index 86578995d20c03134c9fe4f90ce1ffaf77769cc2..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-ExtraBoldItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-ExtraLight.woff2 b/packages/desktop-client/public/Inter/Inter-ExtraLight.woff2
deleted file mode 100644
index 694b2df9fa847ff6a37832ee6d7722d990fc8b68..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-ExtraLight.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-ExtraLightItalic.woff2 b/packages/desktop-client/public/Inter/Inter-ExtraLightItalic.woff2
deleted file mode 100644
index 9a7bd11090c29419fb6514e19d21d3bcc087e9c2..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-ExtraLightItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Italic.woff2 b/packages/desktop-client/public/Inter/Inter-Italic.woff2
deleted file mode 100644
index deca637d81f6b42bffe48b40bf1a4d211e5fd135..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Italic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Light.woff2 b/packages/desktop-client/public/Inter/Inter-Light.woff2
deleted file mode 100644
index 65a7dadddb54a511c3315c0eb896bc910af061e7..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Light.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-LightItalic.woff2 b/packages/desktop-client/public/Inter/Inter-LightItalic.woff2
deleted file mode 100644
index 555fc55955c3b12841d862292c8475659434e6ee..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-LightItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Medium.woff2 b/packages/desktop-client/public/Inter/Inter-Medium.woff2
deleted file mode 100644
index 871ce4ce5db83caad598ac74030d276e96daa6c6..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Medium.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-MediumItalic.woff2 b/packages/desktop-client/public/Inter/Inter-MediumItalic.woff2
deleted file mode 100644
index aa8057992b9504ef17379427ac5fd9c91b9b2c85..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-MediumItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Regular.woff2 b/packages/desktop-client/public/Inter/Inter-Regular.woff2
deleted file mode 100644
index b52dd0a0b7567ac1b117e2ade491175aa7f8409f..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Regular.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-SemiBold.woff2 b/packages/desktop-client/public/Inter/Inter-SemiBold.woff2
deleted file mode 100644
index ece5204a19cd15b0f75013aa40958068d751aaec..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-SemiBold.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-SemiBoldItalic.woff2 b/packages/desktop-client/public/Inter/Inter-SemiBoldItalic.woff2
deleted file mode 100644
index b32c0ba3bd57be4d0687ca3a957bc676dfc0da0b..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-SemiBoldItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-Thin.woff2 b/packages/desktop-client/public/Inter/Inter-Thin.woff2
deleted file mode 100644
index c56bc7ca6df9b969c8c04ca27f110809c52e9e95..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-Thin.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/Inter-ThinItalic.woff2 b/packages/desktop-client/public/Inter/Inter-ThinItalic.woff2
deleted file mode 100644
index eca5608c0fc874830f8e413bf4eaf070b66f8155..0000000000000000000000000000000000000000
Binary files a/packages/desktop-client/public/Inter/Inter-ThinItalic.woff2 and /dev/null differ
diff --git a/packages/desktop-client/public/Inter/inter.css b/packages/desktop-client/public/Inter/inter.css
deleted file mode 100644
index 19565c2755b77ce3cf7367805edcdeaa0c4fcbc4..0000000000000000000000000000000000000000
--- a/packages/desktop-client/public/Inter/inter.css
+++ /dev/null
@@ -1,178 +0,0 @@
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 100;
- font-display: swap;
- src: url("Inter-Thin.woff2?v=3.12") format("woff2"),
- url("Inter-Thin.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 100;
- font-display: swap;
- src: url("Inter-ThinItalic.woff2?v=3.12") format("woff2"),
- url("Inter-ThinItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 200;
- font-display: swap;
- src: url("Inter-ExtraLight.woff2?v=3.12") format("woff2"),
- url("Inter-ExtraLight.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 200;
- font-display: swap;
- src: url("Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
- url("Inter-ExtraLightItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url("Inter-Light.woff2?v=3.12") format("woff2"),
- url("Inter-Light.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 300;
- font-display: swap;
- src: url("Inter-LightItalic.woff2?v=3.12") format("woff2"),
- url("Inter-LightItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url("Inter-Regular.woff2?v=3.12") format("woff2"),
- url("Inter-Regular.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 400;
- font-display: swap;
- src: url("Inter-Italic.woff2?v=3.12") format("woff2"),
- url("Inter-Italic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url("Inter-Medium.woff2?v=3.12") format("woff2"),
- url("Inter-Medium.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 500;
- font-display: swap;
- src: url("Inter-MediumItalic.woff2?v=3.12") format("woff2"),
- url("Inter-MediumItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 600;
- font-display: swap;
- src: url("Inter-SemiBold.woff2?v=3.12") format("woff2"),
- url("Inter-SemiBold.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 600;
- font-display: swap;
- src: url("Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
- url("Inter-SemiBoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 700;
- font-display: swap;
- src: url("Inter-Bold.woff2?v=3.12") format("woff2"),
- url("Inter-Bold.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 700;
- font-display: swap;
- src: url("Inter-BoldItalic.woff2?v=3.12") format("woff2"),
- url("Inter-BoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 800;
- font-display: swap;
- src: url("Inter-ExtraBold.woff2?v=3.12") format("woff2"),
- url("Inter-ExtraBold.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 800;
- font-display: swap;
- src: url("Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
- url("Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 900;
- font-display: swap;
- src: url("Inter-Black.woff2?v=3.12") format("woff2"),
- url("Inter-Black.woff?v=3.12") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 900;
- font-display: swap;
- src: url("Inter-BlackItalic.woff2?v=3.12") format("woff2"),
- url("Inter-BlackItalic.woff?v=3.12") format("woff");
-}
-
-/* -------------------------------------------------------
-Variable font.
-Usage:
-
- html { font-family: 'Inter', sans-serif; }
- @supports (font-variation-settings: normal) {
- html { font-family: 'Inter var', sans-serif; }
- }
-*/
-@font-face {
- font-family: 'Inter var';
- font-weight: 100 900;
- font-display: swap;
- font-style: normal;
- font-named-instance: 'Regular';
- src: url("Inter-roman.var.woff2?v=3.12") format("woff2");
-}
-@font-face {
- font-family: 'Inter var';
- font-weight: 100 900;
- font-display: swap;
- font-style: italic;
- font-named-instance: 'Italic';
- src: url("Inter-italic.var.woff2?v=3.12") format("woff2");
-}
diff --git a/packages/desktop-client/public/index.html b/packages/desktop-client/public/index.html
index 70e89f208b81acdec7871886463c985ca6f14367..109f6721894f6a02c10c99fc59e3715a3ccd4d59 100644
--- a/packages/desktop-client/public/index.html
+++ b/packages/desktop-client/public/index.html
@@ -35,7 +35,6 @@
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
- <link rel="stylesheet" href="%PUBLIC_URL%/Inter/inter.css" />
<style type="text/css">
html,
body {
@@ -49,7 +48,7 @@
body,
button,
input {
- font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI',
+ font-family: 'Inter var', -apple-system, BlinkMacSystemFont, 'Segoe UI',
'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
}
@@ -73,7 +72,7 @@
input,
textarea {
font-size: 1em;
- font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI',
+ font-family: 'Inter var', -apple-system, BlinkMacSystemFont, 'Segoe UI',
'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
}
diff --git a/packages/desktop-client/src/index.js b/packages/desktop-client/src/index.js
index 0cea1e10e62e790e039bd5ad098bdff81944650c..1a7b31c9ec08892a96c65b880896f5f9011d05f0 100644
--- a/packages/desktop-client/src/index.js
+++ b/packages/desktop-client/src/index.js
@@ -5,6 +5,8 @@ import './browser-preload';
// A hack for now: this makes sure it's appended before glamor
import '@reach/listbox/styles.css';
+import 'inter-ui/inter.css';
+
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
diff --git a/packages/desktop-electron/index.js b/packages/desktop-electron/index.js
index 631810808845011f9b6d127c22b440c24934d86b..7428e4f92ad8cdb06907486f795dee1823dab731 100644
--- a/packages/desktop-electron/index.js
+++ b/packages/desktop-electron/index.js
@@ -269,7 +269,7 @@ app.on('ready', async () => {
const pathname = parsedUrl.pathname;
- if (pathname.startsWith('/static') || pathname.startsWith('/Inter')) {
+ if (pathname.startsWith('/static')) {
callback({
path: path.normalize(`${__dirname}/client-build${pathname}`)
});
diff --git a/yarn.lock b/yarn.lock
index 4c722e1364e19ac85573901d03b0c4417f7c86fc..c8bb3944d9a21b467668231bf25eb737ab0c1012 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -95,6 +95,7 @@ __metadata:
glamor: ^2.20.40
html-webpack-plugin: 4.0.0-alpha.2
identity-obj-proxy: 3.0.0
+ inter-ui: ^3.19.3
load-js: ^3.0.3
mini-css-extract-plugin: 0.4.3
mitt: ^1.1.2
@@ -13112,6 +13113,13 @@ __metadata:
languageName: node
linkType: hard
+"inter-ui@npm:^3.19.3":
+ version: 3.19.3
+ resolution: "inter-ui@npm:3.19.3"
+ checksum: 74435e742e9829402cf15ac08aa48541c93e96d7528a29ba3bc2a14b059ccd3f330ddba8b1c96f06bfdda46b0c7e1a406db22a309045b3412b66ec4dcb5efa2a
+ languageName: node
+ linkType: hard
+
"internal-ip@npm:^4.3.0":
version: 4.3.0
resolution: "internal-ip@npm:4.3.0"