imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into element

Browse source
This commit is contained in:
Travis Ralston 2020-07-14 15:04:17 -06:00
commit 322d58ba0c
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
View file

@ -309,7 +309,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<div className="mx_AppearanceUserSettingsTab_fontSlider">
<div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
<Slider
values={[13, 15, 16, 18, 20]}
values={[13, 14, 15, 16, 18]}
value={parseInt(this.state.fontSize, 10)}
onSelectionChange={this.onFontSizeChanged}
displayFunc={_ => ""}
@ -452,7 +452,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
{_t("Appearance Settings only affect this %(brand)s session.", { brand })}
</div>
{this.renderThemeSection()}
{SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}
{this.renderFontSection()}
{this.renderAdvancedSection()}
</div>
);