From 0faf7b865f47a4fc28a0339d999f6592c501e045 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:31:40 +0100
Subject: [PATCH] Set font option width
---
.../tabs/user/_GeneralUserSettingsTab.scss | 3 ++-
.../tabs/user/_StyleUserSettingsTab.scss | 20 +++++++++++++++++++
.../tabs/user/StyleUserSettingsTab.js | 4 ++--
3 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 62d230e752..45aecd032f 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -15,7 +15,8 @@ limitations under the License.
*/
.mx_GeneralUserSettingsTab_changePassword .mx_Field,
-.mx_GeneralUserSettingsTab_themeSection .mx_Field {
+.mx_StyleUserSettingsTab_themeSection .mx_Field,
+.mx_StyleUserSettingsTab_fontScaling .mx_Field {
@mixin mx_Settings_fullWidthField;
}
diff --git a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
new file mode 100644
index 0000000000..dd9646bd5a
--- /dev/null
+++ b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_StyleUserSettingsTab_themeSection .mx_Field,
+.mx_StyleUserSettingsTab_fontScaling .mx_Field {
+ @mixin mx_Settings_fullWidthField;
+}
\ No newline at end of file
diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
index ab9107eac0..e7b7385f5a 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -199,7 +199,7 @@ export default class StyleUserSettingsTab extends React.Component {
.sort((a, b) => a.name.localeCompare(b.name));
const orderedThemes = [...builtInThemes, ...customThemes];
return (
- <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
+ <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_themeSection">
<span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
{systemThemeSection}
<Field id="theme" label={_t("Theme")} element="select"
@@ -217,7 +217,7 @@ export default class StyleUserSettingsTab extends React.Component {
}
_renderFontSection() {
- return <div className="mx_SettingsTab_section">
+ return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
<span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
<Field
type="text"