Newnew #2144

Merged
neb-b merged 8 commits from newnew into master 2018-12-19 06:44:54 +01:00
2 changed files with 3 additions and 1 deletions
Showing only changes of commit 36f4ff0e23 - Show all commits
src/renderer/component
common
header

View file

@ -257,7 +257,8 @@ class IconComponent extends React.PureComponent<Props> {
render() {
const { icon, tooltip, iconColor, size } = this.props;
const Icon = FeatherIcons[icon];
// const Icon = FeatherIcons[icon];
const Icon = customIcons[this.props.icon] || FeatherIcons[this.props.icon];
if (!Icon) {
return null;

View file

@ -59,6 +59,7 @@ const Header = (props: Props) => {
className="header__navigation-item header__navigation-item--back"
description={__('Navigate back')}
disabled={isBackDisabled}
icon={ICONS.BACK_ARROW}
onClick={back}
/>