hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

revert font changes due to update elsewhere already existing

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2020-11-05 12:11:51 -05:00
parent 21db4e39fb
commit e3193fe897
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -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",

5
src/renderer/components/fonts.scss
View File

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

2
src/renderer/components/icon/icon.scss
View File

@ -132,4 +132,4 @@
@extend .active;
}
}
}
}

6
src/renderer/components/icon/icon.tsx
View File

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

5
yarn.lock
View File

@ -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"