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
Enable dark high contrast theme
Kabiru Mwenjad21f1cfc71c5
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex 13fa60bd86d..bb0b55ff591 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -295,6 +295,7 @@ module ApplicationHelper[I18n.t("themes.light"), "light"],[I18n.t("themes.light_high_contrast"), "light_high_contrast"],[I18n.t("themes.dark"), "dark"],+ [I18n.t("themes.dark_high_contrast"), "dark_high_contrast"],[I18n.t("themes.sync_with_os"), "sync_with_os"]]enddiff --git a/app/helpers/colors_helper.rb b/app/helpers/colors_helper.rbindex 5effa615bc0..ccd857ec17a 100644--- a/app/helpers/colors_helper.rb+++ b/app/helpers/colors_helper.rb@@ -207,11 +207,23 @@ module ColorsHelperenddef highlighted_background_dark- <<~CSS.squish+ style = <<~CSS.squishcolor: hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + var(--lighten-by)) * 1%)) !important;background: rgba(var(--color-r), var(--color-g), var(--color-b), var(--background-alpha)) !important;- border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + var(--lighten-by)) * 1%)) !important;CSS+ mode = User.current.pref.theme++ style += if mode == "dark_high_contrast"+ <<~CSS.squish+ border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + 10 + var(--lighten-by)) * 1%)) !important;+ CSS+ else+ <<~CSS.squish+ border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + var(--lighten-by)) * 1%)) !important;+ CSS+ end++ styleenddef highlighted_background_light@@ -235,9 +247,17 @@ module ColorsHelperenddef highlighted_foreground_dark- <<~CSS.squish- color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + var(--lighten-by)) * 1%), 1) !important;- CSS+ mode = User.current.pref.theme++ if mode == "dark_high_contrast"+ <<~CSS.squish+ color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + 10 + var(--lighten-by)) * 1%), 1) !important;+ CSS+ else+ <<~CSS.squish+ color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) + var(--lighten-by)) * 1%), 1) !important;+ CSS+ endenddef highlighted_foreground_lightdiff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erbindex 26cc1677655..0f984fc55bf 100644--- a/app/views/custom_styles/_primer_color_mapping.erb+++ b/app/views/custom_styles/_primer_color_mapping.erb@@ -7,7 +7,8 @@}/* Override Primer variable to ensure compatibility with currentlyconfigured design outside of high contrast mode */- [data-color-mode]:not([data-light-theme=light_high_contrast]) {+ [data-color-mode][data-light-theme=light],+ [data-color-mode][data-dark-theme=dark] {--fgColor-accent: var(--accent-color) !important;--fgColor-link: var(--accent-color) !important;--control-checked-bgColor-rest: var(--control-checked-color) !important;@@ -26,7 +27,8 @@/* Generic color mapping for content variables */[data-light-theme=light_high_contrast],- [data-dark-theme=dark] {+ [data-dark-theme=dark],+ [data-dark-theme=dark_high_contrast] {--avatar-border-color: var(--avatar-borderColor);--list-item-hover--border-color: var(--control-transparent-borderColor-hover);--list-item-hover--color: var(--fgColor-default);@@ -61,19 +63,21 @@}/* For accessibility themes we are also overriding the header and the sidebar */- [data-light-theme=light_high_contrast] {+ [data-light-theme=light_high_contrast],+ [data-dark-theme=dark_high_contrast] {--main-menu-hover-border-color: var(--fgColor-default) !important;--main-menu-bg-selected-border: var(--fgColor-default);--accent-color: var(--fgColor-accent);--link-text-decoration: underline;- --button--primary-font-color: var(--button-primary-fgColor-rest);+ --button--primary-font-color: var(--button-primary-fgColor-rest);--button--primary-background-hover-color: var(--button-primary-bgColor-hover);--button--primary-background-color: var(--button-primary-bgColor-rest);--primary-button-color: var(--button-primary-bgColor-rest);}/* For dark themes we are using a lighter version of the accent and primary color. Otherwise they will not be seen */- [data-dark-theme=dark] {+ [data-dark-theme=dark],+ [data-dark-theme=dark_high_contrast] {--accent-color: var(--accent-color--dark-mode);--content-icon-color: var(--accent-color--dark-mode);--primary-button-color: var(--primary-button-color--dark-mode);@@ -90,4 +94,11 @@--ck-color-labeled-field-label-background: var(--overlay-bgColor);--ck-color-input-disabled-background: var(--bgColor-disabled);}++ [data-dark-theme=dark_high_contrast] {+ --avatar-borderColor: var(--borderColor-emphasis);+ --content-icon-color: var(--fgColor-accent);+ --button--primary-background-disabled-color: var(--button-primary-bgColor-disabled);+ --button--primary-border-disabled-color: var(--button-primary-bgColor-disabled);+ }</style>diff --git a/config/locales/en.yml b/config/locales/en.ymlindex a183c85bfca..dacdae69203 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -740,6 +740,7 @@ en:themes:dark: "Dark"+ dark_high_contrast: "Dark high contrast"light: "Light"light_high_contrast: "Light high contrast"sync_with_os: "Automatic (match OS colour mode)"diff --git a/config/schemas/user_preferences.schema.json b/config/schemas/user_preferences.schema.jsonindex dd4315cec28..a70857bf89b 100644--- a/config/schemas/user_preferences.schema.json+++ b/config/schemas/user_preferences.schema.json@@ -11,7 +11,7 @@},"theme": {"type": "string",- "enum": ["light", "light_high_contrast", "dark", "sync_with_os"]+ "enum": ["light", "light_high_contrast", "dark", "dark_high_contrast", "sync_with_os"]},"disable_keyboard_shortcuts": {"type": "boolean"