From 57269dcaf407c3c5bee3b33c1c18907a5958e255 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 24 Sep 2015 11:08:39 -0700
Subject: [PATCH] Removing default theme no longer in use

---
 api/import.go                                 |  3 ---
 config/config.json                            |  1 -
 docker/dev/config_docker.json                 |  1 -
 docker/local/config_docker.json               |  1 -
 model/config.go                               |  1 -
 .../admin_console/team_settings.jsx           | 22 -------------------
 6 files changed, 29 deletions(-)

diff --git a/api/import.go b/api/import.go
index e3f314d203..b56d991cbb 100644
--- a/api/import.go
+++ b/api/import.go
@@ -24,9 +24,6 @@ func ImportPost(post *model.Post) {
 
 func ImportUser(user *model.User) *model.User {
 	user.MakeNonNil()
-	if len(user.Props["theme"]) == 0 {
-		user.AddProp("theme", utils.Cfg.TeamSettings.DefaultThemeColor)
-	}
 
 	if result := <-Srv.Store.User().Save(user); result.Err != nil {
 		l4g.Error("Error saving user. err=%v", result.Err)
diff --git a/config/config.json b/config/config.json
index aa92ccf4eb..60e197154c 100644
--- a/config/config.json
+++ b/config/config.json
@@ -11,7 +11,6 @@
     "TeamSettings": {
         "SiteName": "Mattermost",
         "MaxUsersPerTeam": 50,
-        "DefaultThemeColor": "#2389D7",
         "EnableTeamCreation": true,
         "EnableUserCreation": true,
         "RestrictCreationToDomains": ""
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 16a4007fa0..06fee9bd5c 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -11,7 +11,6 @@
     "TeamSettings": {
         "SiteName": "Mattermost",
         "MaxUsersPerTeam": 50,
-        "DefaultThemeColor": "#2389D7",
         "EnableTeamCreation": true,
         "EnableUserCreation": true,
         "RestrictCreationToDomains": ""
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 16a4007fa0..06fee9bd5c 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -11,7 +11,6 @@
     "TeamSettings": {
         "SiteName": "Mattermost",
         "MaxUsersPerTeam": 50,
-        "DefaultThemeColor": "#2389D7",
         "EnableTeamCreation": true,
         "EnableUserCreation": true,
         "RestrictCreationToDomains": ""
diff --git a/model/config.go b/model/config.go
index 69f2127b27..31c2b16dcc 100644
--- a/model/config.go
+++ b/model/config.go
@@ -112,7 +112,6 @@ type PrivacySettings struct {
 type TeamSettings struct {
 	SiteName                  string
 	MaxUsersPerTeam           int
-	DefaultThemeColor         string
 	EnableTeamCreation        bool
 	EnableUserCreation        bool
 	RestrictCreationToDomains string
diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx
index fefc0e936d..3e0890f98c 100644
--- a/web/react/components/admin_console/team_settings.jsx
+++ b/web/react/components/admin_console/team_settings.jsx
@@ -28,7 +28,6 @@ export default class TeamSettings extends React.Component {
 
         var config = this.props.config;
         config.TeamSettings.SiteName = React.findDOMNode(this.refs.SiteName).value.trim();
-        config.TeamSettings.DefaultThemeColor = React.findDOMNode(this.refs.DefaultThemeColor).value.trim();
         config.TeamSettings.RestrictCreationToDomains = React.findDOMNode(this.refs.RestrictCreationToDomains).value.trim();
         config.TeamSettings.EnableTeamCreation = React.findDOMNode(this.refs.EnableTeamCreation).checked;
         config.TeamSettings.EnableUserCreation = React.findDOMNode(this.refs.EnableUserCreation).checked;
@@ -122,27 +121,6 @@ export default class TeamSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='DefaultThemeColor'
-                        >
-                            {'Default Theme Color:'}
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='DefaultThemeColor'
-                                ref='DefaultThemeColor'
-                                placeholder='Ex "#2389D7"'
-                                defaultValue={this.props.config.TeamSettings.DefaultThemeColor}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>{'Default theme color for team sites.'}</p>
-                        </div>
-                    </div>
-
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'