From 1c008eb96625e5319cddd5a52601d1af21943097 Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 21 Mar 2022 06:58:36 -0700 Subject: [PATCH] Updating settings icons to use fontawesome and removing unused svgs (#14061) --- app/images/advanced-icon.svg | 4 ---- app/images/alerts-icon.svg | 4 ---- app/images/contacts-icon.svg | 4 ---- app/images/experimental-icon.svg | 5 ----- app/images/general-icon.svg | 4 ---- app/images/info-icon.svg | 4 ---- app/images/network-icon.svg | 4 ---- app/images/security-icon.svg | 4 ---- ui/components/app/tab-bar/tab-bar.stories.js | 16 +++++++------- ui/pages/settings/settings.component.js | 23 ++++++++++---------- 10 files changed, 20 insertions(+), 52 deletions(-) delete mode 100644 app/images/advanced-icon.svg delete mode 100644 app/images/alerts-icon.svg delete mode 100644 app/images/contacts-icon.svg delete mode 100644 app/images/experimental-icon.svg delete mode 100644 app/images/general-icon.svg delete mode 100644 app/images/info-icon.svg delete mode 100644 app/images/network-icon.svg delete mode 100644 app/images/security-icon.svg diff --git a/app/images/advanced-icon.svg b/app/images/advanced-icon.svg deleted file mode 100644 index e53e41788..000000000 --- a/app/images/advanced-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/images/alerts-icon.svg b/app/images/alerts-icon.svg deleted file mode 100644 index 79498650c..000000000 --- a/app/images/alerts-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/images/contacts-icon.svg b/app/images/contacts-icon.svg deleted file mode 100644 index 50391a287..000000000 --- a/app/images/contacts-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/images/experimental-icon.svg b/app/images/experimental-icon.svg deleted file mode 100644 index 90dc810cf..000000000 --- a/app/images/experimental-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/images/general-icon.svg b/app/images/general-icon.svg deleted file mode 100644 index 32029ef12..000000000 --- a/app/images/general-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/images/info-icon.svg b/app/images/info-icon.svg deleted file mode 100644 index 6fd99c9da..000000000 --- a/app/images/info-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/images/network-icon.svg b/app/images/network-icon.svg deleted file mode 100644 index 4e4685e06..000000000 --- a/app/images/network-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/images/security-icon.svg b/app/images/security-icon.svg deleted file mode 100644 index 4d3fa1459..000000000 --- a/app/images/security-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ui/components/app/tab-bar/tab-bar.stories.js b/ui/components/app/tab-bar/tab-bar.stories.js index 4f9128955..a133bce9b 100644 --- a/ui/components/app/tab-bar/tab-bar.stories.js +++ b/ui/components/app/tab-bar/tab-bar.stories.js @@ -18,43 +18,43 @@ export default { args: { tabs: [ { - icon: , + icon: , content: 'General', key: 'general', }, { - icon: , + icon: , content: 'Contacts', key: 'contacts', }, { - icon: , + icon: , content: 'Snaps', key: 'snaps', }, { - icon: , + icon: , content: 'SecurityAndPrivacy', key: 'securityAndPrivacy', }, { - icon: , + icon: , content: 'Alerts', key: 'alerts', }, { - icon: , + icon: , content: 'Networks', key: 'networks', }, { - icon: , + icon: , content: 'Experimental', key: 'experimental', }, { - icon: , + icon: , content: 'About', key: 'about', }, diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js index bc4fc2ac2..0e91e570a 100644 --- a/ui/pages/settings/settings.component.js +++ b/ui/pages/settings/settings.component.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; import { Switch, Route, matchPath } from 'react-router-dom'; import classnames from 'classnames'; import TabBar from '../../components/app/tab-bar'; + import { ALERTS_ROUTE, ADVANCED_ROUTE, @@ -255,26 +256,26 @@ class SettingsPage extends PureComponent { , + icon: , content: t('general'), key: GENERAL_ROUTE, }, { - icon: , + icon: , content: t('advanced'), key: ADVANCED_ROUTE, }, { - icon: , + icon: , content: t('contacts'), key: CONTACT_LIST_ROUTE, }, ///: BEGIN:ONLY_INCLUDE_IN(flask) { icon: ( - {t('snapsSettingsDescription')} ), content: t('snaps'), @@ -282,27 +283,27 @@ class SettingsPage extends PureComponent { }, ///: END:ONLY_INCLUDE_IN { - icon: , + icon: , content: t('securityAndPrivacy'), key: SECURITY_ROUTE, }, { - icon: , + icon: , content: t('alerts'), key: ALERTS_ROUTE, }, { - icon: , + icon: , content: t('networks'), key: NETWORKS_ROUTE, }, { - icon: , + icon: , content: t('experimental'), key: EXPERIMENTAL_ROUTE, }, { - icon: , + icon: , content: t('about'), key: ABOUT_US_ROUTE, },