diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-10-28 13:53:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-28 13:53:22 +0200 |
commit | 59d665af9d4c2dc505e5d5267b02b1df96e90a7d (patch) | |
tree | 7ae3acd32a0c94a2b157bfebdee3d479ffc6f5d1 /src/components/settings/services | |
parent | New Crowdin updates (#2154) [skip ci] (diff) | |
download | ferdium-app-59d665af9d4c2dc505e5d5267b02b1df96e90a7d.tar.gz ferdium-app-59d665af9d4c2dc505e5d5267b02b1df96e90a7d.tar.zst ferdium-app-59d665af9d4c2dc505e5d5267b02b1df96e90a7d.zip |
chore: remove @mdi/font in favor of using icons with @mdi/js directly (#2158)
Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
Diffstat (limited to 'src/components/settings/services')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 10 | ||||
-rw-r--r-- | src/components/settings/services/ServiceItem.js | 14 |
2 files changed, 14 insertions, 10 deletions
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'; | |||
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import normalizeUrl from 'normalize-url'; | 6 | import normalizeUrl from 'normalize-url'; |
7 | 7 | ||
8 | import { mdiInformation } from '@mdi/js'; | ||
8 | import Form from '../../../lib/Form'; | 9 | import Form from '../../../lib/Form'; |
9 | import Recipe from '../../../models/Recipe'; | 10 | import Recipe from '../../../models/Recipe'; |
10 | import Service from '../../../models/Service'; | 11 | import Service from '../../../models/Service'; |
@@ -19,6 +20,7 @@ import Select from '../../ui/Select'; | |||
19 | 20 | ||
20 | import { isMac } from '../../../environment'; | 21 | import { isMac } from '../../../environment'; |
21 | import globalMessages from '../../../i18n/globalMessages'; | 22 | import globalMessages from '../../../i18n/globalMessages'; |
23 | import { Icon } from '../../ui/icon'; | ||
22 | 24 | ||
23 | const messages = defineMessages({ | 25 | const messages = defineMessages({ |
24 | saveService: { | 26 | saveService: { |
@@ -315,7 +317,7 @@ class EditServiceForm extends Component { | |||
315 | marginTop: 0, | 317 | marginTop: 0, |
316 | }} | 318 | }} |
317 | > | 319 | > |
318 | <span className="mdi mdi-information" /> | 320 | <Icon icon={mdiInformation} /> |
319 | {recipe.message} | 321 | {recipe.message} |
320 | </p> | 322 | </p> |
321 | )} | 323 | )} |
@@ -415,11 +417,11 @@ class EditServiceForm extends Component { | |||
415 | </div> | 417 | </div> |
416 | </div> | 418 | </div> |
417 | <p> | 419 | <p> |
418 | <span className="mdi mdi-information" /> | 420 | <Icon icon={mdiInformation} /> |
419 | {intl.formatMessage(messages.proxyRestartInfo)} | 421 | {intl.formatMessage(messages.proxyRestartInfo)} |
420 | </p> | 422 | </p> |
421 | <p> | 423 | <p> |
422 | <span className="mdi mdi-information" /> | 424 | <Icon icon={mdiInformation} /> |
423 | {intl.formatMessage(messages.proxyInfo)} | 425 | {intl.formatMessage(messages.proxyInfo)} |
424 | </p> | 426 | </p> |
425 | </> | 427 | </> |
@@ -458,7 +460,7 @@ class EditServiceForm extends Component { | |||
458 | /> | 460 | /> |
459 | </div> | 461 | </div> |
460 | <p style={{ marginTop: 10, marginBottom: 10 }}> | 462 | <p style={{ marginTop: 10, marginBottom: 10 }}> |
461 | <span className="mdi mdi-information" /> | 463 | <Icon icon={mdiInformation} /> |
462 | {intl.formatMessage(messages.recipeFileInfo)} | 464 | {intl.formatMessage(messages.recipeFileInfo)} |
463 | </p> | 465 | </p> |
464 | </> | 466 | </> |
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'; | |||
5 | import { observer } from 'mobx-react'; | 5 | import { observer } from 'mobx-react'; |
6 | import classnames from 'classnames'; | 6 | import classnames from 'classnames'; |
7 | 7 | ||
8 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; | ||
8 | import ServiceModel from '../../../models/Service'; | 9 | import ServiceModel from '../../../models/Service'; |
10 | import { Icon } from '../../ui/icon'; | ||
9 | 11 | ||
10 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
11 | tooltipIsDisabled: { | 13 | tooltipIsDisabled: { |
@@ -59,24 +61,24 @@ class ServiceItem extends Component { | |||
59 | </td> | 61 | </td> |
60 | <td className="service-table__column-info" onClick={goToServiceForm}> | 62 | <td className="service-table__column-info" onClick={goToServiceForm}> |
61 | {service.isMuted && ( | 63 | {service.isMuted && ( |
62 | <span | 64 | <Icon |
63 | className="mdi mdi-bell-off" | 65 | icon={mdiBellOff} |
64 | data-tip={intl.formatMessage(messages.tooltipIsMuted)} | 66 | data-tip={intl.formatMessage(messages.tooltipIsMuted)} |
65 | /> | 67 | /> |
66 | )} | 68 | )} |
67 | </td> | 69 | </td> |
68 | <td className="service-table__column-info" onClick={goToServiceForm}> | 70 | <td className="service-table__column-info" onClick={goToServiceForm}> |
69 | {!service.isEnabled && ( | 71 | {!service.isEnabled && ( |
70 | <span | 72 | <Icon |
71 | className="mdi mdi-power" | 73 | icon={mdiPower} |
72 | data-tip={intl.formatMessage(messages.tooltipIsDisabled)} | 74 | data-tip={intl.formatMessage(messages.tooltipIsDisabled)} |
73 | /> | 75 | /> |
74 | )} | 76 | )} |
75 | </td> | 77 | </td> |
76 | <td className="service-table__column-info" onClick={goToServiceForm}> | 78 | <td className="service-table__column-info" onClick={goToServiceForm}> |
77 | {!service.isNotificationEnabled && ( | 79 | {!service.isNotificationEnabled && ( |
78 | <span | 80 | <Icon |
79 | className="mdi mdi-message-bulleted-off" | 81 | icon={mdiMessageBulletedOff} |
80 | data-tip={intl.formatMessage( | 82 | data-tip={intl.formatMessage( |
81 | messages.tooltipNotificationsDisabled, | 83 | messages.tooltipNotificationsDisabled, |
82 | )} | 84 | )} |