mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Jorik Schellekens 2020-06-18 15:47:26 +01:00
parent f2440388b1
commit 37b299412f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,9 +58,9 @@ interface IState extends IThemeState {
useIRCLayout: boolean;
}
const MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
private themeTimer: NodeJS.Timeout;
@ -212,7 +212,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
});
SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
}
};
private renderThemeSection() {
const themeWatcher = new ThemeWatcher();
@ -297,7 +297,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
<EventTilePreview
className="mx_AppearanceUserSettingsTab_fontSlider_preview"
message={MESSAGE_PREVIEW_TEXT}
message={this.MESSAGE_PREVIEW_TEXT}
useIRCLayout={this.state.useIRCLayout}
/>
<div className="mx_AppearanceUserSettingsTab_fontSlider">
@ -340,9 +340,9 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButtons" >
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
<MessagePreview
<EventTilePreview
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
message={MESSAGE_PREVIEW_TEXT}
message={this.MESSAGE_PREVIEW_TEXT}
useIRCLayout={true}
/>
<StyledRadioButton
@ -356,9 +356,9 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
</div>
<div className="mx_AppearanceUserSettingsTab_spacer" />
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
<MessagePreview
<EventTilePreview
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
message={MESSAGE_PREVIEW_TEXT}
message={this.MESSAGE_PREVIEW_TEXT}
useIRCLayout={false}
/>
<StyledRadioButton
@ -371,8 +371,8 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
</StyledRadioButton>
</div>
</div>
</div>
}
</div>;
};
render() {
return (