From 1e0ff01d50292aacca3e887cca62dbe491d504fd Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Jul 2020 15:33:17 +0100
Subject: [PATCH] De labs font-scaling

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.tsx  | 2 +-
 src/i18n/strings/en_EN.json                                 | 1 -
 src/settings/Settings.js                                    | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9bed2fb039..325d5cede6 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -439,7 +439,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                     {_t("Appearance Settings only affect this Riot session.")}
                 </div>
                 {this.renderThemeSection()}
-                {SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}
+                {this.renderFontSection()}
                 {SettingsStore.isFeatureEnabled("feature_irc_ui") ? this.renderLayoutSection() : null}
                 {this.renderAdvancedSection()}
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b23264a297..5a79b01003 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -480,7 +480,6 @@
     "You changed the room topic": "You changed the room topic",
     "%(senderName)s changed the room topic": "%(senderName)s changed the room topic",
     "New spinner design": "New spinner design",
-    "Font scaling": "Font scaling",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 58d9ed4f31..fd85f6970d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -103,12 +103,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_font_scaling": {
-        isFeature: true,
-        displayName: _td("Font scaling"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),