matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-16 06:42:26 +03:00
Code Activity

Set font option width

Browse Source
This commit is contained in:
Jorik Schellekens
2020-04-16 10:31:40 +01:00
parent 14551b1885
commit 0faf7b865f
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
View File

@@ -15,7 +15,8 @@ limitations under the License.
*/ */
.mx_GeneralUserSettingsTab_changePassword .mx_Field, .mx_GeneralUserSettingsTab_changePassword .mx_Field,
.mx_GeneralUserSettingsTab_themeSection .mx_Field { .mx_StyleUserSettingsTab_themeSection .mx_Field,
.mx_StyleUserSettingsTab_fontScaling .mx_Field {
@mixin mx_Settings_fullWidthField; @mixin mx_Settings_fullWidthField;
} }

20
res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss Normal file
View File

@@ -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;
}

4
src/components/views/settings/tabs/user/StyleUserSettingsTab.js
View File

@@ -199,7 +199,7 @@ export default class StyleUserSettingsTab extends React.Component {
.sort((a, b) => a.name.localeCompare(b.name)); .sort((a, b) => a.name.localeCompare(b.name));
const orderedThemes = [...builtInThemes, ...customThemes]; const orderedThemes = [...builtInThemes, ...customThemes];
return ( 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> <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
{systemThemeSection} {systemThemeSection}
<Field id="theme" label={_t("Theme")} element="select" <Field id="theme" label={_t("Theme")} element="select"
@@ -217,7 +217,7 @@ export default class StyleUserSettingsTab extends React.Component {
} }
_renderFontSection() { _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> <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
<Field <Field
type="text" type="text"