diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx
index b093b3ec9f..ce200ad754 100644
--- a/webapp/components/login/login.jsx
+++ b/webapp/components/login/login.jsx
@@ -422,13 +422,13 @@ export default class Login extends React.Component {
className='signup-team-logo'
src={logoImage}
/>
-
{global.window.mm_config.SiteName}
-
-
-
+
{global.window.mm_config.SiteName}
+
+
+
{content}
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index 5804a641e3..45a708d8c6 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -6,22 +6,17 @@ import TeamStore from 'stores/team_store.jsx';
import * as Utils from 'utils/utils.jsx';
import ErrorBar from 'components/error_bar.jsx';
import LoadingScreen from 'components/loading_screen.jsx';
-import Client from 'utils/web_client.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as GlobalActions from 'action_creators/global_actions.jsx';
-import * as TextFormatting from 'utils/text_formatting.jsx';
-
import {Link} from 'react-router';
import {FormattedMessage} from 'react-intl';
-//import {browserHistory, Link} from 'react-router';
-
import React from 'react';
import logoImage from 'images/logo.png';
-export default class Login extends React.Component {
+export default class SelectTeam extends React.Component {
constructor(props) {
super(props);
@@ -53,34 +48,9 @@ export default class Login extends React.Component {
};
}
- createCustomLogin() {
- if (global.window.mm_license.IsLicensed === 'true' &&
- global.window.mm_license.CustomBrand === 'true' &&
- global.window.mm_config.EnableCustomBrand === 'true') {
- const text = global.window.mm_config.CustomBrandText || '';
-
- return (
-
-
)
-
-
- );
- }
-
- return null;
- }
-
render() {
var content;
- let customClass;
- const customContent = this.createCustomLogin();
- if (customContent) {
- customClass = 'branded';
- }
-
var teamContents = [];
var isAlreadyMember = new Map();
@@ -231,10 +201,7 @@ export default class Login extends React.Component {