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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced

Browse source
This commit is contained in:
Jorik Schellekens 2020-06-22 15:35:48 +01:00
commit d54676aefe
10 changed files with 308 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/settings/Settings.js
View file

@ -155,7 +155,7 @@ export const SETTINGS = {
},
"feature_irc_ui": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Use IRC layout'),
displayName: _td('Enable IRC layout option in the appearance tab'),
default: false,
isFeature: true,
},
@ -180,7 +180,7 @@ export const SETTINGS = {
controller: new FontSizeController(),
},
"useCustomFontSize": {
displayName: _td("Custom font size"),
displayName: _td("Use custom size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: false,
},
@ -559,4 +559,9 @@ export const SETTINGS = {
displayName: _td("IRC display name width"),
default: 80,
},
"useIRCLayout": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("Use IRC layout"),
default: false,
},
};