From bda9830656a7eaafb03685c9689b45844550f601 Mon Sep 17 00:00:00 2001 From: Behrokh Satarnejad <62008897+bsatarnejad@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:07:01 +0200 Subject: [PATCH] [58130] Primer button press remains green despite oclo (#16835) map the primer active button to our variables in light and dark modes --- app/views/custom_styles/_primer_color_mapping.erb | 1 + frontend/src/global_styles/openproject/_variable_defaults.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erb index e169a42e33c0..57a050ab2f91 100644 --- a/app/views/custom_styles/_primer_color_mapping.erb +++ b/app/views/custom_styles/_primer_color_mapping.erb @@ -16,6 +16,7 @@ --controlKnob-borderColor-checked: var(--control-checked-color) !important; --button-primary-fgColor-rest: var(--button--primary-font-color) !important; --button-primary-bgColor-rest: var(--button--primary-background-color) !important; + --button-primary-bgColor-active: var(--button--primary-background-active-color) !important; --button-primary-bgColor-hover: var(--button--primary-background-hover-color) !important; --button-primary-bgColor-disabled: var(--button--primary-background-disabled-color) !important; --button-primary-borderColor-disabled: var(--button--primary-border-disabled-color) !important; diff --git a/frontend/src/global_styles/openproject/_variable_defaults.scss b/frontend/src/global_styles/openproject/_variable_defaults.scss index 57f165baedbe..6a6462d0a642 100644 --- a/frontend/src/global_styles/openproject/_variable_defaults.scss +++ b/frontend/src/global_styles/openproject/_variable_defaults.scss @@ -112,6 +112,7 @@ --button--active-border-color: #cacaca; --button--primary-background-color: var(--primary-button-color); --button--primary-background-hover-color: var(--primary-button-color--major1); + --button--primary-background-active-color: var(--primary-button-color--major1); --button--primary-background-disabled-color: var(--primary-button-color--minor2); --button--primary-border-color: var(--button--primary-background-color); --button--primary-border-disabled-color: var(--primary-button-color--minor2);