diff --git a/docs/main/administration-guide/configure/experimental-configuration-settings.mdx b/docs/main/administration-guide/configure/experimental-configuration-settings.mdx
index 92cf9117537..fe539f05166 100644
--- a/docs/main/administration-guide/configure/experimental-configuration-settings.mdx
+++ b/docs/main/administration-guide/configure/experimental-configuration-settings.mdx
@@ -13,10 +13,10 @@ Review and manage the following [experimental](/administration-guide/manage/feat
-System admins managing a self-hosted Mattermost deployment can edit the `config.json` file as described in the following tables. Each configuration value below includes a JSON path to access the value programmatically in the `config.json` file using a JSON-aware tool. For example, one `LoginButtonColor` value is under `EmailSettings`.
+System admins managing a self-hosted Mattermost deployment can edit the `config.json` file as described in the following tables. Each configuration value below includes a JSON path to access the value programmatically in the `config.json` file using a JSON-aware tool. For example, the `EmailBatchingBufferSize` value is under `EmailSettings`.
-- If using a tool such as [jq](https://stedolan.github.io/jq/), you'd enter: `cat config/config.json | jq '.EmailSettings.LoginButtonColor'`
-- When working with the `config.json` file manually, look for an object such as `EmailSettings`, then within that object, find the key `LoginButtonColor`.
+- If using a tool such as [jq](https://stedolan.github.io/jq/), you'd enter: `cat config/config.json | jq '.EmailSettings.EmailBatchingBufferSize'`
+- When working with the `config.json` file manually, look for an object such as `EmailSettings`, then within that object, find the key `EmailBatchingBufferSize`.
@@ -101,51 +101,6 @@ Specify the maximum frequency, in seconds, which the batching job checks for new
-### Email login button color
-
-Specify the color of the email login button for white labeling purposes. Use a hex code with a \#-sign before the code. This setting only applies to the mobile app.
-
-
-
-
-
-
-
-This feature's config.json setting is "LoginButtonColor": "" with string input. |
-
-
-
-
-### Email login button border color
-
-Specify the color of the email login button border for white labeling purposes. Use a hex code with a \#-sign before the code. This setting only applies to the mobile app.
-
-
-
-
-
-
-
-This feature's config.json setting is "LoginButtonBorderColor": "" with string input. |
-
-
-
-
-### Email login button text color
-
-Specify the color of the email login button text for white labeling purposes. Use a hex code with a \#-sign before the code. This setting only applies to the mobile app.
-
-
-
-
-
-
-
-This feature's config.json setting is "LoginButtonTextColor": "" with string input. |
-
-
-
-
### Enable account deactivation
**True**: Ability for users to deactivate their own account from **Settings \> Advanced \> Deactivate Account**. If a user deactivates their own account, they will get an email notification confirming they were deactivated. Available only when authentication is set to use email/password. Not available when authentication uses SAML or AD/LDAP.
diff --git a/e2e-tests/cypress/tests/support/api/cloud_default_config.json b/e2e-tests/cypress/tests/support/api/cloud_default_config.json
index 1489c96cbd1..99de903bee6 100644
--- a/e2e-tests/cypress/tests/support/api/cloud_default_config.json
+++ b/e2e-tests/cypress/tests/support/api/cloud_default_config.json
@@ -175,10 +175,7 @@
"EmailBatchingInterval": 30,
"EnablePreviewModeBanner": true,
"SkipServerCertificateVerification": false,
- "EmailNotificationContentsType": "full",
- "LoginButtonColor": "#0000",
- "LoginButtonBorderColor": "#2389D7",
- "LoginButtonTextColor": "#2389D7"
+ "EmailNotificationContentsType": "full"
},
"PrivacySettings": {
"ShowEmailAddress": true,
diff --git a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json
index 6a46c1383b4..27bd956d616 100644
--- a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json
+++ b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json
@@ -257,10 +257,7 @@
"EmailBatchingInterval": 30,
"EnablePreviewModeBanner": true,
"SkipServerCertificateVerification": false,
- "EmailNotificationContentsType": "full",
- "LoginButtonColor": "#0000",
- "LoginButtonBorderColor": "#2389D7",
- "LoginButtonTextColor": "#2389D7"
+ "EmailNotificationContentsType": "full"
},
"RateLimitSettings": {
"Enable": false,
diff --git a/e2e-tests/playwright/lib/src/server/default_config.ts b/e2e-tests/playwright/lib/src/server/default_config.ts
index b11d4f77ad0..57920db1ff6 100644
--- a/e2e-tests/playwright/lib/src/server/default_config.ts
+++ b/e2e-tests/playwright/lib/src/server/default_config.ts
@@ -405,9 +405,6 @@ const defaultServerConfig: AdminConfig = {
EnablePreviewModeBanner: true,
SkipServerCertificateVerification: false,
EmailNotificationContentsType: 'full',
- LoginButtonColor: '#0000',
- LoginButtonBorderColor: '#2389D7',
- LoginButtonTextColor: '#2389D7',
},
RateLimitSettings: {
Enable: false,
diff --git a/server/channels/app/email/email_test.go b/server/channels/app/email/email_test.go
index c3dc783e83c..0483b438441 100644
--- a/server/channels/app/email/email_test.go
+++ b/server/channels/app/email/email_test.go
@@ -469,9 +469,6 @@ func TestMailServiceConfig(t *testing.T) {
EnablePreviewModeBanner: new(bool),
SkipServerCertificateVerification: new(bool),
EmailNotificationContentsType: new(string),
- LoginButtonColor: new(string),
- LoginButtonBorderColor: new(string),
- LoginButtonTextColor: new(string),
},
}
},
diff --git a/server/config/client.go b/server/config/client.go
index d6226644da8..8f7c9e265dc 100644
--- a/server/config/client.go
+++ b/server/config/client.go
@@ -322,10 +322,6 @@ func GenerateLimitedClientConfig(c *model.Config, telemetryID string, license *m
props["EnableSignInWithEmail"] = strconv.FormatBool(*c.EmailSettings.EnableSignInWithEmail)
props["EnableSignInWithUsername"] = strconv.FormatBool(*c.EmailSettings.EnableSignInWithUsername)
- props["EmailLoginButtonColor"] = *c.EmailSettings.LoginButtonColor
- props["EmailLoginButtonBorderColor"] = *c.EmailSettings.LoginButtonBorderColor
- props["EmailLoginButtonTextColor"] = *c.EmailSettings.LoginButtonTextColor
-
props["TermsOfServiceLink"] = *c.SupportSettings.TermsOfServiceLink
props["PrivacyPolicyLink"] = *c.SupportSettings.PrivacyPolicyLink
props["AboutLink"] = *c.SupportSettings.AboutLink
diff --git a/server/public/model/config.go b/server/public/model/config.go
index 8d8277da711..fb3608c99f8 100644
--- a/server/public/model/config.go
+++ b/server/public/model/config.go
@@ -2164,9 +2164,6 @@ type EmailSettings struct {
EnablePreviewModeBanner *bool `access:"site_notifications"`
SkipServerCertificateVerification *bool `access:"environment_smtp,write_restrictable,cloud_restrictable"`
EmailNotificationContentsType *string `access:"site_notifications"`
- LoginButtonColor *string `access:"experimental_features"`
- LoginButtonBorderColor *string `access:"experimental_features"`
- LoginButtonTextColor *string `access:"experimental_features"`
}
func (s *EmailSettings) SetDefaults(isUpdate bool) {
@@ -2297,18 +2294,6 @@ func (s *EmailSettings) SetDefaults(isUpdate bool) {
if s.EmailNotificationContentsType == nil {
s.EmailNotificationContentsType = new(EmailNotificationContentsFull)
}
-
- if s.LoginButtonColor == nil {
- s.LoginButtonColor = new("#0000")
- }
-
- if s.LoginButtonBorderColor == nil {
- s.LoginButtonBorderColor = new("#2389D7")
- }
-
- if s.LoginButtonTextColor == nil {
- s.LoginButtonTextColor = new("#2389D7")
- }
}
type RateLimitSettings struct {
diff --git a/server/tests/test-config.json b/server/tests/test-config.json
index a566a781efb..780e905b53d 100644
--- a/server/tests/test-config.json
+++ b/server/tests/test-config.json
@@ -164,10 +164,7 @@
"EmailBatchingInterval": 30,
"EnablePreviewModeBanner": true,
"SkipServerCertificateVerification": false,
- "EmailNotificationContentsType": "full",
- "LoginButtonColor": "",
- "LoginButtonBorderColor": "",
- "LoginButtonTextColor": ""
+ "EmailNotificationContentsType": "full"
},
"RateLimitSettings": {
"Enable": false,
diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx
index 5e132d6860a..709142a1d3f 100644
--- a/webapp/channels/src/components/admin_console/admin_definition.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition.tsx
@@ -6548,30 +6548,6 @@ const AdminDefinition: AdminDefinitionType = {
placeholder: defineMessage({id: 'admin.experimental.emailBatchingInterval.example', defaultMessage: 'E.g.: "30"'}),
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
},
- {
- type: 'color',
- key: 'EmailSettings.LoginButtonColor',
- label: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonColor.title', defaultMessage: 'Email Login Button Color:'}),
- help_text: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonColor.desc', defaultMessage: 'Specify the color of the email login button for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.'}),
- help_text_markdown: false,
- isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
- },
- {
- type: 'color',
- key: 'EmailSettings.LoginButtonBorderColor',
- label: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonBorderColor.title', defaultMessage: 'Email Login Button Border Color:'}),
- help_text: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonBorderColor.desc', defaultMessage: 'Specify the color of the email login button border for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.'}),
- help_text_markdown: false,
- isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
- },
- {
- type: 'color',
- key: 'EmailSettings.LoginButtonTextColor',
- label: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonTextColor.title', defaultMessage: 'Email Login Button Text Color:'}),
- help_text: defineMessage({id: 'admin.experimental.emailSettingsLoginButtonTextColor.desc', defaultMessage: 'Specify the color of the email login button text for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.'}),
- help_text_markdown: false,
- isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
- },
{
type: 'bool',
key: 'TeamSettings.EnableUserDeactivation',
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 671634e6455..ff7502b787c 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1322,12 +1322,6 @@
"admin.experimental.emailBatchingInterval.desc": "Specify the maximum frequency, in seconds, which the batching job checks for new notifications. Longer batching intervals will increase performance.",
"admin.experimental.emailBatchingInterval.example": "E.g.: \"30\"",
"admin.experimental.emailBatchingInterval.title": "Email Batching Interval:",
- "admin.experimental.emailSettingsLoginButtonBorderColor.desc": "Specify the color of the email login button border for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
- "admin.experimental.emailSettingsLoginButtonBorderColor.title": "Email Login Button Border Color:",
- "admin.experimental.emailSettingsLoginButtonColor.desc": "Specify the color of the email login button for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
- "admin.experimental.emailSettingsLoginButtonColor.title": "Email Login Button Color:",
- "admin.experimental.emailSettingsLoginButtonTextColor.desc": "Specify the color of the email login button text for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
- "admin.experimental.emailSettingsLoginButtonTextColor.title": "Email Login Button Text Color:",
"admin.experimental.enableChannelViewedMessages.desc": "This setting determines whether `channel_viewed` WebSocket events are sent, which synchronize unread notifications across clients and devices. Disabling the setting in larger deployments may improve server performance.",
"admin.experimental.enableChannelViewedMessages.title": "Enable Channel Viewed WebSocket Messages:",
"admin.experimental.enableOnboardingFlow.desc": "When true, new users are shown steps to complete as part of an onboarding process",
diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts
index beee225ba47..b584c891890 100644
--- a/webapp/platform/types/src/config.ts
+++ b/webapp/platform/types/src/config.ts
@@ -45,9 +45,6 @@ export type ClientConfig = {
DiagnosticsEnabled: string;
DisableRefetchingOnBrowserFocus: string;
DisableWakeUpReconnectHandler: string;
- EmailLoginButtonBorderColor: string;
- EmailLoginButtonColor: string;
- EmailLoginButtonTextColor: string;
EmailNotificationContentsType: string;
EnableAskCommunityLink: string;
EnableBanner: string;
@@ -654,9 +651,6 @@ export type EmailSettings = {
EnablePreviewModeBanner: boolean;
SkipServerCertificateVerification: boolean;
EmailNotificationContentsType: string;
- LoginButtonColor: string;
- LoginButtonBorderColor: string;
- LoginButtonTextColor: string;
};
export type RateLimitSettings = {