From e3193fe89754c5ec215dc0c53b4b93e0cd457081 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 5 Nov 2020 12:11:51 -0500
Subject: [PATCH] revert font changes due to update elsewhere already existing

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 package.json                           | 1 -
 src/renderer/components/fonts.scss     | 5 +----
 src/renderer/components/icon/icon.scss | 2 +-
 src/renderer/components/icon/icon.tsx  | 6 +++---
 yarn.lock                              | 5 -----
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index b3c3dea110..2aae54e4cd 100644
--- a/package.json
+++ b/package.json
@@ -233,7 +233,6 @@
     "lodash": "^4.17.15",
     "mac-ca": "^1.0.4",
     "marked": "^1.1.0",
-    "material-design-icons-iconfont": "^6.1.0",
     "md5-file": "^5.0.0",
     "mobx": "^5.15.5",
     "mobx-observable-history": "^1.0.3",
diff --git a/src/renderer/components/fonts.scss b/src/renderer/components/fonts.scss
index 1c61ef1de9..102f87d05e 100644
--- a/src/renderer/components/fonts.scss
+++ b/src/renderer/components/fonts.scss
@@ -1,7 +1,4 @@
-$material-design-icons-font-directory-path: '~material-design-icons-iconfont/dist/fonts/';
-
 // Custom fonts
-@import "~material-design-icons-iconfont/src/material-design-icons";
 @import "~typeface-roboto/index.css";
 
 // Material Design Icons, used primarily in icon.tsx
@@ -20,4 +17,4 @@ $material-design-icons-font-directory-path: '~material-design-icons-iconfont/dis
   font-family: 'RobotoMono';
   src: local('RobotoMono'),
   url('fonts/roboto-mono-nerd.ttf') format('truetype');
-}
+}
\ No newline at end of file
diff --git a/src/renderer/components/icon/icon.scss b/src/renderer/components/icon/icon.scss
index 77a4523bbf..e581ccbbdc 100644
--- a/src/renderer/components/icon/icon.scss
+++ b/src/renderer/components/icon/icon.scss
@@ -132,4 +132,4 @@
       @extend .active;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/renderer/components/icon/icon.tsx b/src/renderer/components/icon/icon.tsx
index ce479049aa..8fc86e6301 100644
--- a/src/renderer/components/icon/icon.tsx
+++ b/src/renderer/components/icon/icon.tsx
@@ -9,7 +9,7 @@ import { TooltipDecoratorProps, withTooltip } from "../tooltip";
 import isNumber from "lodash/isNumber"
 
 export interface IconProps extends React.HTMLAttributes<any>, TooltipDecoratorProps {
-  material?: string;          // material-icon, see available names at https://jossef.github.io/material-design-icons-iconfont/
+  material?: string;          // material-icon, see available names at https://material.io/icons/
   svg?: string;               // svg-filename without extension in current folder
   link?: LocationDescriptor;   // render icon as NavLink from react-router-dom
   href?: string;              // render icon as hyperlink
@@ -32,7 +32,7 @@ export class Icon extends React.PureComponent<IconProps> {
 
   get isInteractive() {
     const { interactive, onClick, href, link } = this.props;
-    return !!(interactive || onClick || href || link);
+    return interactive || !!(onClick || href || link);
   }
 
   @autobind()
@@ -87,7 +87,7 @@ export class Icon extends React.PureComponent<IconProps> {
 
     // render as inline svg-icon
     if (svg) {
-      const svgIconText = require(`!!raw-loader!./${svg}.svg`).default;
+      const svgIconText = require("!!raw-loader!./" + svg + ".svg").default;
       iconContent = <span className="icon" dangerouslySetInnerHTML={{ __html: svgIconText }}/>;
     }
 
diff --git a/yarn.lock b/yarn.lock
index b484eda7f8..72b2025686 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9476,11 +9476,6 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-material-design-icons-iconfont@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.0.tgz#ffad21a71f2000336fd410cbeba36ddbf301f0f2"
-  integrity sha512-wRJtOo1v1ch+gN8PRsj0IGJznk+kQ8mz13ds/nuhLI+Qyf/931ZlRpd92oq0IRPpZIb+bhX8pRjzIVdcPDKmiQ==
-
 md5-file@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-5.0.0.tgz#e519f631feca9c39e7f9ea1780b63c4745012e20"