OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Remove obsolete design variable
Henriette Darge82fd47abf646
diff --git a/app/views/custom_styles/_inline_css.erb b/app/views/custom_styles/_inline_css.erbindex bc174fa26c7..e12a4a0a6cb 100644--- a/app/views/custom_styles/_inline_css.erb+++ b/app/views/custom_styles/_inline_css.erb@@ -38,9 +38,6 @@ See COPYRIGHT and LICENSE files for more details.--header-border-bottom-color: #d0d7de;<% end %><% end %>- <% if design_color.variable == "header-item-bg-hover-color" %>- --header-item-font-hover-color: <%= design_color.contrasting_font_color %>;- <% end %><% if design_color.variable == "main-menu-bg-color" %>--main-menu-font-color: <%= design_color.contrasting_font_color %>;<% if design_color.dark? %>@@ -76,8 +73,7 @@ See COPYRIGHT and LICENSE files for more details.<%# Trying to hit the query cache for the condition here: %><% if DesignColor.overwritten.map(&:variable).include?('header-bg-color') &&- DesignColor.overwritten.select { |design_color| design_color.variable == 'header-bg-color' }.try(:first).try(:hexcode) == '#FFFFFF' &&- DesignColor.overwritten.select { |design_color| design_color.variable == 'header-item-bg-hover-color' }.try(:first).try(:hexcode) == '#FFFFFF' %>+ DesignColor.overwritten.select { |design_color| design_color.variable == 'header-bg-color' }.try(:first).try(:hexcode) == '#FFFFFF' %><%# Disable hover background color to not overlap border %>.top-menu-search.-collapsed .top-menu-search--button:hover {background: transparent;diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erbindex 2d97d0ebfd7..cdad77c4a60 100644--- a/app/views/custom_styles/_primer_color_mapping.erb+++ b/app/views/custom_styles/_primer_color_mapping.erb@@ -49,7 +49,6 @@--header-border-bottom-width: 1px;--header-bg-color: var(--page-header-bgColor);--header-item-font-color: var(--fgColor-default);- --header-item-bg-hover-color: var(--control-transparent-bgColor-hover);--header-item-font-hover-color: var(--fgColor-default);--header-border-bottom-color: var(--borderColor-muted) !important;--main-menu-bg-selected-background: var(--control-checked-borderColor-rest);diff --git a/config/locales/en.yml b/config/locales/en.ymlindex 258107f1a96..1dc8d044d07 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -72,7 +72,6 @@ en:primary-button-color: "Primary button"accent-color: "Accent"header-bg-color: "Header background"- header-item-bg-hover-color: "Header background on hover"main-menu-bg-color: "Main menu background"main-menu-bg-selected-background: "Main menu when selected"custom_colors: "Custom colors"@@ -80,10 +79,6 @@ en:instructions:primary-button-color: "Strong accent color, used for the most important button on a screen."accent-color: "Color for links and other decently highlighted elements."- header-item-bg-hover-color: "Background color of clickable header items when hovered with the mouse."- header-item-font-color: "Font color of clickable header items."- header-item-font-hover-color: "Font color of clickable header items when hovered with the mouse."- header-border-bottom-color: "Thin line under the header. Leave this field empty if you don't want any line."main-menu-bg-color: "Left side menu's background color."theme_warning: Changing the theme will overwrite you custom style. The design will then be lost. Are you sure you want to continue?enterprise:diff --git a/docs/installation-and-operations/configuration/README.md b/docs/installation-and-operations/configuration/README.mdindex cab8af34040..37a1d3b2188 100644--- a/docs/installation-and-operations/configuration/README.md+++ b/docs/installation-and-operations/configuration/README.md@@ -266,7 +266,6 @@ In an automated deployment setup, such as installing OpenProject using our HelmOPENPROJECT_SEED_DESIGN_PRIMARY__BUTTON__COLOR="#1F883D"OPENPROJECT_SEED_DESIGN_ACCENT__COLOR="#1F883D"OPENPROJECT_SEED_DESIGN_HEADER__BG__COLOR="#1A67A3"-OPENPROJECT_SEED_DESIGN_HEADER__ITEM__BG__HOVER__COLOR="#E5E5E5"OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__COLOR="#FFFFFF"OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__SELECTED__BACKGROUND="#1F883D"OPENPROJECT_SEED_DESIGN_EXPORT__COVER__TEXT__COLOR="#333333"diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.sass b/frontend/src/app/core/global_search/input/global-search-input.component.sassindex 9cd7023977b..3eb961e2cb5 100644--- a/frontend/src/app/core/global_search/input/global-search-input.component.sass+++ b/frontend/src/app/core/global_search/input/global-search-input.component.sass@@ -37,7 +37,6 @@ $search-input-height: 30pxpadding: 0 8px&:hover- background: var(--header-item-bg-hover-color)color: var(--header-item-font-hover-color)border-bottom: var(--header-border-bottom-width) solid var(--header-border-bottom-color)diff --git a/frontend/src/global_styles/openproject/_variable_defaults.scss b/frontend/src/global_styles/openproject/_variable_defaults.scssindex 23b4568a911..ed99724ec98 100644--- a/frontend/src/global_styles/openproject/_variable_defaults.scss+++ b/frontend/src/global_styles/openproject/_variable_defaults.scss@@ -76,7 +76,6 @@--header-item-font-size: 14px;--header-item-font-color: #FFFFFF;--header-item-font-hover-color: #FFFFFF;- --header-item-bg-hover-color: #175A8E;--main-menu-toggler-top-spacing: 18px;--main-menu-toggler-z-index: 550;--main-menu-width: 280px;diff --git a/lib/open_project/custom_styles/color_themes.rb b/lib/open_project/custom_styles/color_themes.rbindex 10d7a9a7a65..e1f2b8ece2d 100644--- a/lib/open_project/custom_styles/color_themes.rb+++ b/lib/open_project/custom_styles/color_themes.rb@@ -48,7 +48,6 @@ module OpenProject::CustomStyles"primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR,"accent-color" => ACCENT_COLOR,"header-bg-color" => "#1A67A3",- "header-item-bg-hover-color" => "#175A8E","main-menu-bg-color" => "#FFFFFF","main-menu-bg-selected-background" => "#175A8E",}@@ -59,7 +58,6 @@ module OpenProject::CustomStyles"primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR,"accent-color" => ACCENT_COLOR,"header-bg-color" => "#FAFAFA",- "header-item-bg-hover-color" => "#E1E1E1","main-menu-bg-color" => "#ECECEC","main-menu-bg-selected-background" => "#A9A9A9",},@@ -71,7 +69,6 @@ module OpenProject::CustomStyles"primary-button-color" => PRIMER_PRIMARY_BUTTON_COLOR,"accent-color" => ACCENT_COLOR,"header-bg-color" => "#05002C",- "header-item-bg-hover-color" => "#163473","main-menu-bg-color" => "#0E2045","main-menu-bg-selected-background" => "#3270DB",}diff --git a/lib/open_project/custom_styles/design.rb b/lib/open_project/custom_styles/design.rbindex b26ffd7b528..a9b74de96d5 100644--- a/lib/open_project/custom_styles/design.rb+++ b/lib/open_project/custom_styles/design.rb@@ -71,7 +71,6 @@ module OpenProject::CustomStyles%w( primary-button-coloraccent-colorheader-bg-color- header-item-bg-hover-colormain-menu-bg-colormain-menu-bg-selected-background)enddiff --git a/modules/bim/lib/open_project/bim/patches/color_themes_patch.rb b/modules/bim/lib/open_project/bim/patches/color_themes_patch.rbindex 034d3aef271..9a627518832 100644--- a/modules/bim/lib/open_project/bim/patches/color_themes_patch.rb+++ b/modules/bim/lib/open_project/bim/patches/color_themes_patch.rb@@ -26,7 +26,6 @@ module OpenProject::Bimcolors: {"primary-button-color" => OpenProject::CustomStyles::ColorThemes::PRIMER_PRIMARY_BUTTON_COLOR,"header-bg-color" => "#05002C",- "header-item-bg-hover-color" => "#163473","accent-color" => "#275BB5","main-menu-bg-color" => "#0E2045","main-menu-bg-selected-background" => "#3270DB",diff --git a/spec/seeders/env_data/custom_design_seeder_spec.rb b/spec/seeders/env_data/custom_design_seeder_spec.rbindex e791af6d624..8703bc81517 100644--- a/spec/seeders/env_data/custom_design_seeder_spec.rb+++ b/spec/seeders/env_data/custom_design_seeder_spec.rb@@ -76,7 +76,6 @@ RSpec.describe EnvData::CustomDesignSeeder, :webmock doOPENPROJECT_SEED_DESIGN_PRIMARY__BUTTON__COLOR: "#571EFA",OPENPROJECT_SEED_DESIGN_ACCENT__COLOR: "#571EFA",OPENPROJECT_SEED_DESIGN_HEADER__BG__COLOR: "#FFFFFF",- OPENPROJECT_SEED_DESIGN_HEADER__ITEM__BG__HOVER__COLOR: "#E5E5E5",OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__COLOR: "#FFFFFF",OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__SELECTED__BACKGROUND: "#571EFA",OPENPROJECT_SEED_DESIGN_TOUCH__ICON: "http://test.foobar.com/image.png",@@ -90,7 +89,6 @@ RSpec.describe EnvData::CustomDesignSeeder, :webmock doexpect(DesignColor.find_by(variable: "primary-button-color").hexcode).to eq("#571EFA")expect(DesignColor.find_by(variable: "accent-color").hexcode).to eq("#571EFA")expect(DesignColor.find_by(variable: "header-bg-color").hexcode).to eq("#FFFFFF")- expect(DesignColor.find_by(variable: "header-item-bg-hover-color").hexcode).to eq("#E5E5E5")expect(DesignColor.find_by(variable: "main-menu-bg-color").hexcode).to eq("#FFFFFF")expect(DesignColor.find_by(variable: "main-menu-bg-selected-background").hexcode).to eq("#571EFA")@@ -210,10 +208,9 @@ RSpec.describe EnvData::CustomDesignSeeder, :webmock doDesignColor.create!(variable: "primary-button-color", hexcode: "#571EFA")DesignColor.create!(variable: "accent-color", hexcode: "#571EFA")DesignColor.create!(variable: "header-bg-color", hexcode: "#FFFFFF")- DesignColor.create!(variable: "header-item-bg-hover-color", hexcode: "#E5E5E5")DesignColor.create!(variable: "main-menu-bg-color", hexcode: "#FFFFFF")DesignColor.create!(variable: "main-menu-bg-selected-background", hexcode: "#571EFA")- expect(DesignColor.count).to eq(6)+ expect(DesignColor.count).to eq(5)seeder.seed!