Merge branch 'develop' into joriks/font-scaling-message-preview

This commit is contained in:
Jorik Schellekens 2020-06-18 15:19:28 +01:00 committed by GitHub
commit 15881fc7d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
101 changed files with 1697 additions and 739 deletions

View file

@ -45,7 +45,7 @@ interface IThemeState {
export interface CustomThemeMessage {
isError: boolean;
text: string;
};
}
interface IState extends IThemeState {
// String displaying the current selected fontSize.
@ -162,7 +162,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
);
return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
}
};
private onAddCustomTheme = async (): Promise<void> => {
let currentThemes: string[] = SettingsStore.getValue("custom_themes");