From ccdac98bae88c52064ab064eee868cbd6cba8754 Mon Sep 17 00:00:00 2001 From: Behrokh Satarnejad Date: Wed, 25 Sep 2024 09:50:29 +0200 Subject: [PATCH 1/2] change color theme options title --- lib/open_project/custom_styles/color_themes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/open_project/custom_styles/color_themes.rb b/lib/open_project/custom_styles/color_themes.rb index facf3984d553..f25f18ff7eef 100644 --- a/lib/open_project/custom_styles/color_themes.rb +++ b/lib/open_project/custom_styles/color_themes.rb @@ -30,7 +30,7 @@ module OpenProject::CustomStyles module ColorThemes module_function - OpenProject::CustomStyles::ColorThemes::DEFAULT_THEME_NAME = "OpenProject".freeze + OpenProject::CustomStyles::ColorThemes::DEFAULT_THEME_NAME = "OpenProject default".freeze DEPRECATED_ALTERNATIVE_COLOR = "#35C53F".freeze DEPRECATED_PRIMARY_COLOR = "#1A67A3".freeze @@ -61,7 +61,7 @@ module ColorThemes } }, { - theme: "OpenProject Light", + theme: "OpenProject Grey", colors: { "primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR, "accent-color" => ACCENT_COLOR, @@ -81,7 +81,7 @@ module ColorThemes logo: "logo_openproject.png" }, { - theme: "OpenProject Dark", + theme: "OpenProject Navy Blue", colors: { "primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR, "accent-color" => ACCENT_COLOR, From 787f1c0f7b83463bf79ff079bc8bf9527984419a Mon Sep 17 00:00:00 2001 From: Behrokh Satarnejad Date: Wed, 25 Sep 2024 11:49:04 +0200 Subject: [PATCH 2/2] fix failing tests --- lib/open_project/custom_styles/color_themes.rb | 4 ++-- spec/features/custom_styles/tabs_navigation_spec.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/open_project/custom_styles/color_themes.rb b/lib/open_project/custom_styles/color_themes.rb index f25f18ff7eef..d5624ee35eb4 100644 --- a/lib/open_project/custom_styles/color_themes.rb +++ b/lib/open_project/custom_styles/color_themes.rb @@ -30,7 +30,7 @@ module OpenProject::CustomStyles module ColorThemes module_function - OpenProject::CustomStyles::ColorThemes::DEFAULT_THEME_NAME = "OpenProject default".freeze + OpenProject::CustomStyles::ColorThemes::DEFAULT_THEME_NAME = "OpenProject (default)".freeze DEPRECATED_ALTERNATIVE_COLOR = "#35C53F".freeze DEPRECATED_PRIMARY_COLOR = "#1A67A3".freeze @@ -61,7 +61,7 @@ module ColorThemes } }, { - theme: "OpenProject Grey", + theme: "OpenProject Gray", colors: { "primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR, "accent-color" => ACCENT_COLOR, diff --git a/spec/features/custom_styles/tabs_navigation_spec.rb b/spec/features/custom_styles/tabs_navigation_spec.rb index 443c12cc6e7b..2017ef6c6063 100644 --- a/spec/features/custom_styles/tabs_navigation_spec.rb +++ b/spec/features/custom_styles/tabs_navigation_spec.rb @@ -58,7 +58,7 @@ end it "selects a color theme and redirect to the interface tab" do - select("OpenProject Light", from: "theme") + select("OpenProject Gray", from: "theme") find("[data-test-selector='color-theme-button']").click expect(page).to have_css(".op-toast.-success", text: I18n.t(:notice_successful_update)) expect(page).to have_current_path custom_style_path(tab: "interface") @@ -76,7 +76,7 @@ expect(page).to have_current_path custom_style_path(tab: "branding") # select a color theme and redirect to the branding tab - select("OpenProject Dark", from: "theme") + select("OpenProject Navy Blue", from: "theme") find("[data-test-selector='color-theme-button']").click expect(page).to have_css(".op-toast.-success", text: I18n.t(:notice_successful_update)) expect(page).to have_current_path custom_style_path(tab: "branding") @@ -92,7 +92,7 @@ expect(page).to have_current_path custom_style_path(tab: "pdf_export_styles") # select a color theme and redirect to the PDF export styles tab - select("OpenProject", from: "theme") + select("OpenProject (default)", from: "theme") find("[data-test-selector='color-theme-button']").click expect(page).to have_css(".op-toast.-success", text: I18n.t(:notice_successful_update)) expect(page).to have_current_path custom_style_path(tab: "pdf_export_styles")