From c36dd6e983a19058665f86c3ad4e1bec25a1d3e6 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Fri, 10 May 2024 10:31:53 -0300 Subject: [PATCH] Change default theme (#174) --- .github/workflows/build_and_test_workflow.yml | 2 +- packages/osd-ui-shared-deps/theme.ts | 2 +- src/core/server/ui_settings/settings/theme.ts | 2 +- src/core/server/ui_settings/ui_settings_config.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index 69689d019df2..e86e5578bda3 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -139,7 +139,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] #Removed 'windows-latest' - group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] + group: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 13] include: - os: ubuntu-latest name: Linux diff --git a/packages/osd-ui-shared-deps/theme.ts b/packages/osd-ui-shared-deps/theme.ts index c803a5e37ef7..d469063feb9e 100644 --- a/packages/osd-ui-shared-deps/theme.ts +++ b/packages/osd-ui-shared-deps/theme.ts @@ -37,7 +37,7 @@ export type Theme = typeof LightTheme; // in the OpenSearch Dashboards app we can rely on this global being defined, but in // some cases (like jest) the global is undefined -export const tag: string = globals.__osdThemeTag__ || 'v8light'; +export const tag: string = globals.__osdThemeTag__ || 'v7light'; export const version = tag.startsWith('v7') ? 7 : 8; export const darkMode = tag.endsWith('dark'); diff --git a/src/core/server/ui_settings/settings/theme.ts b/src/core/server/ui_settings/settings/theme.ts index 94dec047ff35..c1fb6adaca33 100644 --- a/src/core/server/ui_settings/settings/theme.ts +++ b/src/core/server/ui_settings/settings/theme.ts @@ -50,7 +50,7 @@ export const getThemeSettings = (): Record => { name: i18n.translate('core.ui_settings.params.themeVersionTitle', { defaultMessage: 'Theme version', }), - value: 'Next (preview)', + value: 'v7', type: 'select', options: ['v7', 'Next (preview)'], description: i18n.translate('core.ui_settings.params.themeVersionText', { diff --git a/src/core/server/ui_settings/ui_settings_config.ts b/src/core/server/ui_settings/ui_settings_config.ts index 6924640ca1e5..1f71e58bd7ec 100644 --- a/src/core/server/ui_settings/ui_settings_config.ts +++ b/src/core/server/ui_settings/ui_settings_config.ts @@ -56,7 +56,7 @@ const configSchema = schema.object({ overrides: schema.object({}, { unknowns: 'allow' }), defaults: schema.object({ 'theme:darkMode': schema.maybe(schema.boolean({ defaultValue: false })), - 'theme:version': schema.maybe(schema.string({ defaultValue: 'v8' })), + 'theme:version': schema.maybe(schema.string({ defaultValue: 'v7' })), }), });