From 59d665af9d4c2dc505e5d5267b02b1df96e90a7d Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 28 Oct 2021 13:53:22 +0200 Subject: chore: remove @mdi/font in favor of using icons with @mdi/js directly (#2158) Co-authored-by: Vijay A --- src/components/settings/SettingsLayout.js | 8 ++++++-- src/components/settings/recipes/RecipesDashboard.js | 4 +++- src/components/settings/services/EditServiceForm.js | 10 ++++++---- src/components/settings/services/ServiceItem.js | 14 ++++++++------ src/components/settings/settings/EditSettingsForm.js | 8 +++++--- .../settings/supportFerdi/SupportFerdiDashboard.tsx | 12 +++++++----- 6 files changed, 35 insertions(+), 21 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index be11fdb8e..e9119a944 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -3,9 +3,11 @@ import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; +import { mdiClose } from '@mdi/js'; import ErrorBoundary from '../util/ErrorBoundary'; import { oneOrManyChildElements } from '../../prop-types'; import Appear from '../ui/effects/Appear'; +import { Icon } from '../ui/icon'; const messages = defineMessages({ closeSettings: { @@ -62,10 +64,12 @@ class SettingsLayout extends Component { {children} diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index bdb6f3ca0..dcf7a4784 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -6,6 +6,7 @@ import { Link } from 'react-router'; import injectSheet from 'react-jss'; +import { mdiOpenInNew } from '@mdi/js'; import { Button } from '../../ui/button/index'; import { Input } from '../../ui/input/index'; import { H3, H2 } from '../../ui/headline'; @@ -16,6 +17,7 @@ import Loader from '../../ui/Loader'; import Appear from '../../ui/effects/Appear'; import { FRANZ_SERVICE_REQUEST } from '../../../config'; import RecipePreview from '../../../models/RecipePreview'; +import { Icon } from '../../ui/icon'; const messages = defineMessages({ headline: { @@ -197,7 +199,7 @@ class RecipesDashboard extends Component { rel="noreferrer" > {intl.formatMessage(messages.missingService)}{' '} - + {/* )} */} diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index b040e6cc2..2c451d7bf 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -5,6 +5,7 @@ import { Link } from 'react-router'; import { defineMessages, injectIntl } from 'react-intl'; import normalizeUrl from 'normalize-url'; +import { mdiInformation } from '@mdi/js'; import Form from '../../../lib/Form'; import Recipe from '../../../models/Recipe'; import Service from '../../../models/Service'; @@ -19,6 +20,7 @@ import Select from '../../ui/Select'; import { isMac } from '../../../environment'; import globalMessages from '../../../i18n/globalMessages'; +import { Icon } from '../../ui/icon'; const messages = defineMessages({ saveService: { @@ -315,7 +317,7 @@ class EditServiceForm extends Component { marginTop: 0, }} > - + {recipe.message}

)} @@ -415,11 +417,11 @@ class EditServiceForm extends Component {

- + {intl.formatMessage(messages.proxyRestartInfo)}

- + {intl.formatMessage(messages.proxyInfo)}

@@ -458,7 +460,7 @@ class EditServiceForm extends Component { />

- + {intl.formatMessage(messages.recipeFileInfo)}

diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index e08b9af1f..d83e5fd56 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -5,7 +5,9 @@ import ReactTooltip from 'react-tooltip'; import { observer } from 'mobx-react'; import classnames from 'classnames'; +import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; import ServiceModel from '../../../models/Service'; +import { Icon } from '../../ui/icon'; const messages = defineMessages({ tooltipIsDisabled: { @@ -59,24 +61,24 @@ class ServiceItem extends Component { {service.isMuted && ( - )} {!service.isEnabled && ( - )} {!service.isNotificationEnabled && ( - {intl.formatMessage(messages.translationHelp)}{' '} - + )} @@ -797,7 +799,7 @@ class EditSettingsForm extends Component { )}

- + Ferdi is based on{' '}
- + {intl.formatMessage(messages.languageDisclaimer)}

diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx index 505c49812..88e936b71 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx @@ -1,6 +1,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { BrowserWindow } from '@electron/remote'; +import { mdiOpenInNew } from '@mdi/js'; import InfoBar from '../../ui/InfoBar'; +import { Icon } from '../../ui/icon'; const messages = defineMessages({ headline: { @@ -159,7 +161,7 @@ const SupportFerdiDashboard = () => { > {' '} {intl.formatMessage(messages.textListContributorsHere)} - +

@@ -175,7 +177,7 @@ const SupportFerdiDashboard = () => { > {' '} {intl.formatMessage(messages.textSupportWelcomeHere)} - +

@@ -188,7 +190,7 @@ const SupportFerdiDashboard = () => { > {' '} {intl.formatMessage(messages.textOpenCollective)} - +

@@ -201,7 +203,7 @@ const SupportFerdiDashboard = () => { > {' '} {intl.formatMessage(messages.textOpenCollective)} - + {' '} {intl.formatMessage(messages.textDonationAnd)} { > {' '} {intl.formatMessage(messages.textGitHubSponsors)} - +

-- cgit v1.2.3-70-g09d2