PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4899 from matrix-org/joriks/delabs-font-scaling

Browse source 
De labs font-scaling
This commit is contained in:
Jorik Schellekens 2020-07-14 22:01:34 +01:00 committed by GitHub
commit 87069a9856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show stats 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">
<div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div> <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
<Slider <Slider
values={[13, 15, 16, 18, 20]} values={[13, 14, 15, 16, 18]}
value={parseInt(this.state.fontSize, 10)} value={parseInt(this.state.fontSize, 10)}
onSelectionChange={this.onFontSizeChanged} onSelectionChange={this.onFontSizeChanged}
displayFunc={_ => ""} displayFunc={_ => ""}
@ -445,7 +445,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
{_t("Appearance Settings only affect this Riot session.")} {_t("Appearance Settings only affect this Riot session.")}
</div> </div>
{this.renderThemeSection()} {this.renderThemeSection()}
{SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null} {this.renderFontSection()}
{this.renderAdvancedSection()} {this.renderAdvancedSection()}
</div> </div>
); );

1
src/i18n/strings/en_EN.json
View file

@ -480,7 +480,6 @@
"You changed the room topic": "You changed the room topic", "You changed the room topic": "You changed the room topic",
"%(senderName)s changed the room topic": "%(senderName)s changed the room topic", "%(senderName)s changed the room topic": "%(senderName)s changed the room topic",
"New spinner design": "New spinner design", "New spinner design": "New spinner design",
"Font scaling": "Font scaling",
"Message Pinning": "Message Pinning", "Message Pinning": "Message Pinning",
"Custom user status messages": "Custom user status messages", "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)", "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",

6
src/settings/Settings.js
View file

@ -103,12 +103,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE, supportedLevels: LEVELS_FEATURE,
default: false, default: false,
}, },
"feature_font_scaling": {
isFeature: true,
displayName: _td("Font scaling"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_pinning": { "feature_pinning": {
isFeature: true, isFeature: true,
displayName: _td("Message Pinning"), displayName: _td("Message Pinning"),