Skip to content

Commit

Permalink
replace assets in settings
Browse files Browse the repository at this point in the history
  • Loading branch information
paulclindo committed Mar 2, 2021
1 parent 3800940 commit a711fa5
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 16 deletions.
1 change: 1 addition & 0 deletions app/ergo-connector/assets/images/connected_icon.inline.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions app/ergo-connector/assets/images/info_icon.inline.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/ergo-connector/assets/images/language_icon.inline.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/ergo-connector/assets/images/support_icon.inline.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 15 additions & 10 deletions app/ergo-connector/components/Settings.js
@@ -1,18 +1,23 @@
// @flow
import React, { Component } from 'react';
import type { Node } from 'react';
import InfoIcon from '../assets/images/info_icon.inline.svg';
import styles from './Settings.scss';
import { ROUTES } from '../routes-config';
import { observer } from 'mobx-react';
import { Link } from 'react-router-dom';
import { intlShape, defineMessages } from 'react-intl';
import classNames from 'classnames';
import { Select } from 'react-polymorph/lib/components/Select';
import { SelectSkin } from 'react-polymorph/lib/skins/simple/SelectSkin';
import { intlShape, defineMessages } from 'react-intl';

import styles from './Settings.scss';
import { ROUTES } from '../routes-config';
import { observer } from 'mobx-react';
import FlagLabel from '../../components/widgets/FlagLabel';
import classNames from 'classnames';
import ReactToolboxMobxForm from '../../utils/ReactToolboxMobxForm';
import globalMessages, { connectorMessages } from '../../i18n/global-messages';
import InfoIcon from '../assets/images/info_icon.inline.svg';
import SupportIcon from '../assets/images/support_icon.inline.svg';
import TermsUseIcon from '../assets/images/terms_of_use_icon.inline.svg';
import LanguageIcon from '../assets/images/language_icon.inline.svg';
import ConnectedIcon from '../assets/images/connected_icon.inline.svg';

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
import ArrowBack from '../assets/images/arrow_back.inline.svg';
Expand Down Expand Up @@ -52,17 +57,17 @@ export default class Settings extends Component<any> {
},
{
label: intl.formatMessage(connectorMessages.connectedWebsites),
icon: <InfoIcon />,
icon: <ConnectedIcon />,
route: ROUTES.CONNECTED_WEBSITES,
},
{
label: intl.formatMessage(globalMessages.support),
icon: <InfoIcon />,
icon: <SupportIcon />,
route: '#',
},
{
label: intl.formatMessage(globalMessages.termsOfUse),
icon: <InfoIcon />,
icon: <TermsUseIcon />,
route: '#',
},
];
Expand Down Expand Up @@ -101,7 +106,7 @@ export default class Settings extends Component<any> {
</li>
))}
<li className={styles.listItemLanguage}>
<InfoIcon />
<LanguageIcon />
<Select
className={languageSelectClassNames}
options={languageOptions}
Expand Down
7 changes: 5 additions & 2 deletions app/ergo-connector/components/Settings.scss
Expand Up @@ -40,6 +40,9 @@
align-items: center;
cursor: pointer;
text-decoration: none;
& > svg {
flex: 0 0 24px;
}
}
}
.label {
Expand All @@ -50,10 +53,10 @@

.listItemLanguage {
display: flex;
padding: 5px 32px;
padding: 8px 32px;
& svg {
margin-right: -3px;
margin-top: 6px;
margin-top: 4px;
}
& div {
flex: 1;
Expand Down

0 comments on commit a711fa5

Please sign in to comment.