mirror of
https://github.com/element-hq/element-web
synced 2024-10-25 04:05:55 +03:00
Fix merge conflicts
This commit is contained in:
parent
f2440388b1
commit
37b299412f
1 changed files with 9 additions and 9 deletions
|
@ -58,9 +58,9 @@ interface IState extends IThemeState {
|
||||||
useIRCLayout: boolean;
|
useIRCLayout: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
|
|
||||||
|
|
||||||
export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
|
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;
|
private themeTimer: NodeJS.Timeout;
|
||||||
|
|
||||||
|
@ -212,7 +212,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
||||||
});
|
});
|
||||||
|
|
||||||
SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
|
SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
|
||||||
}
|
};
|
||||||
|
|
||||||
private renderThemeSection() {
|
private renderThemeSection() {
|
||||||
const themeWatcher = new ThemeWatcher();
|
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>
|
<span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
|
||||||
<EventTilePreview
|
<EventTilePreview
|
||||||
className="mx_AppearanceUserSettingsTab_fontSlider_preview"
|
className="mx_AppearanceUserSettingsTab_fontSlider_preview"
|
||||||
message={MESSAGE_PREVIEW_TEXT}
|
message={this.MESSAGE_PREVIEW_TEXT}
|
||||||
useIRCLayout={this.state.useIRCLayout}
|
useIRCLayout={this.state.useIRCLayout}
|
||||||
/>
|
/>
|
||||||
<div className="mx_AppearanceUserSettingsTab_fontSlider">
|
<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_RadioButtons" >
|
||||||
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
||||||
<MessagePreview
|
<EventTilePreview
|
||||||
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
||||||
message={MESSAGE_PREVIEW_TEXT}
|
message={this.MESSAGE_PREVIEW_TEXT}
|
||||||
useIRCLayout={true}
|
useIRCLayout={true}
|
||||||
/>
|
/>
|
||||||
<StyledRadioButton
|
<StyledRadioButton
|
||||||
|
@ -356,9 +356,9 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_AppearanceUserSettingsTab_spacer" />
|
<div className="mx_AppearanceUserSettingsTab_spacer" />
|
||||||
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
<div className="mx_AppearanceUserSettingsTab_Layout_RadioButton">
|
||||||
<MessagePreview
|
<EventTilePreview
|
||||||
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
|
||||||
message={MESSAGE_PREVIEW_TEXT}
|
message={this.MESSAGE_PREVIEW_TEXT}
|
||||||
useIRCLayout={false}
|
useIRCLayout={false}
|
||||||
/>
|
/>
|
||||||
<StyledRadioButton
|
<StyledRadioButton
|
||||||
|
@ -371,8 +371,8 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
|
||||||
</StyledRadioButton>
|
</StyledRadioButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>;
|
||||||
}
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
|
|
Loading…
Reference in a new issue