diff options
| -rw-r--r-- | api/import.go | 3 | ||||
| -rw-r--r-- | config/config.json | 1 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 1 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 1 | ||||
| -rw-r--r-- | model/config.go | 1 | ||||
| -rw-r--r-- | web/react/components/admin_console/team_settings.jsx | 22 |
6 files changed, 0 insertions, 29 deletions
diff --git a/api/import.go b/api/import.go index e3f314d20..b56d991cb 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 aa92ccf4e..60e197154 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 16a4007fa..06fee9bd5 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 16a4007fa..06fee9bd5 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 69f2127b2..31c2b16dc 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 fefc0e936..3e0890f98 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; @@ -125,27 +124,6 @@ export default class TeamSettings extends React.Component { <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' htmlFor='EnableTeamCreation' > {'Enable Team Creation: '} |