matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-19 05:22:13 +03:00
Code Activity

fascist linting >:(

Browse Source
This commit is contained in:
Matthew Hodgson
2017-10-25 02:31:30 +01:00
parent ae40ef4460
commit 6beb604cd0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/UserSettingsStore.js
View File

@@ -189,7 +189,8 @@ export default {
if (!syncedSettings || !syncedSettings.theme) { if (!syncedSettings || !syncedSettings.theme) {
theme = (SdkConfig.get() ? SdkConfig.get().default_theme : undefined) || 'light'; theme = (SdkConfig.get() ? SdkConfig.get().default_theme : undefined) || 'light';
} }
else { else
{
theme = syncedSettings.theme; theme = syncedSettings.theme;
} }
return theme; return theme;

8
src/components/views/login/LoginPage.js
View File

@@ -28,13 +28,14 @@ module.exports = React.createClass({
return ( return (
<div className="mx_StatusLogin"> <div className="mx_StatusLogin">
<div className="mx_StatusLogin_brand"> <div className="mx_StatusLogin_brand">
<img src="themes/status/img/logo.svg" alt="Status" width="221" height="53"/> <img src="themes/status/img/logo.svg" alt="Status" width="221" height="53" />
</div> </div>
<div className="mx_StatusLogin_content"> <div className="mx_StatusLogin_content">
<div className="mx_StatusLogin_header"> <div className="mx_StatusLogin_header">
<h1>Status Community Chat</h1> <h1>Status Community Chat</h1>
<div className="mx_StatusLogin_subtitle"> <div className="mx_StatusLogin_subtitle">
A safer, decentralised communication platform <a href="https://riot.im">powered by Riot</a> A safer, decentralised communication
platform <a href="https://riot.im">powered by Riot</a>
</div> </div>
</div> </div>
{ this.props.children } { this.props.children }
@@ -47,7 +48,8 @@ module.exports = React.createClass({
</div> </div>
); );
} }
else { else
{
return ( return (
<div className="mx_Login"> <div className="mx_Login">
{ this.props.children } { this.props.children }