From 7891d34a05984cd1d7b39a0316e8405e3bf79ead Mon Sep 17 00:00:00 2001 From: Mike Conley Date: Wed, 12 May 2021 20:45:30 +0000 Subject: [PATCH] Bug 1708534 - Use the specified input colours for dark and light built-in themes. r=jaws It looks like we erroneously used the placeholder colour for the dark theme input colour. This updates the dark theme to use the correct colour. It also updates the light theme to use the same input colours as defined in the light variation of the system theme. Differential Revision: https://phabricator.services.mozilla.com/D115000 --- browser/themes/addons/dark/manifest.json | 2 +- browser/themes/addons/light/manifest.json | 13 +++++++++++-- .../mozapps/extensions/default-theme/manifest.json | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json index d0dae35b1fa6..cdf4e666c3a5 100644 --- a/browser/themes/addons/dark/manifest.json +++ b/browser/themes/addons/dark/manifest.json @@ -48,7 +48,7 @@ "button_primary_color": "rgb(43, 42, 51)", "error_text_color": "rgb(255, 154, 162)", "input_background": "#42414D", - "input_color": "#BFBFC9", + "input_color": "rgb(251,251,254)", "input_border": "#8f8f9d", "input_border_error": "rgb(255, 132, 138)", "zoom_controls": "rgb(74,74,85)", diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json index 4d2b41edf819..38dc4d439472 100644 --- a/browser/themes/addons/light/manifest.json +++ b/browser/themes/addons/light/manifest.json @@ -46,6 +46,9 @@ "button_primary_active": "rgb(5, 62, 148)", "button_primary_color": "rgb(251, 251, 254)", "error_text_color": "rgb(197,0,66)", + "input_color": "rgb(21,20,26)", + "input_background": "rgb(255,255,255)", + "input_border_error": "#E22850", "autocomplete_popup_hover": "rgb(240,240,244)", "autocomplete_popup_separator": "rgb(240,240,244)", "appmenu_update_icon_color": "#2AC3A2", @@ -58,7 +61,8 @@ "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)", "panel_active": "color-mix(in srgb, currentColor 20%, transparent)", "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)", - "toolbar_field_icon_opacity": "0.72" + "toolbar_field_icon_opacity": "0.72", + "input_border_color": "color-mix(in srgb, currentColor 41%, transparent)" } }, @@ -74,6 +78,10 @@ "button_primary_active": "--button-primary-active-bgcolor", "button_primary_color": "--button-primary-color", "error_text_color": "--error-text-color", + "input_background": "--input-bgcolor", + "input_color": "--input-color", + "input_border": "--input-border-color", + "input_border_error": "--input-error-border-color", "autocomplete_popup_hover": "--autocomplete-popup-hover-background", "autocomplete_popup_separator": "--autocomplete-popup-separator-color", "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor", @@ -86,7 +94,8 @@ "panel_hover": "--arrowpanel-dimmed", "panel_active": "-arrowpanel-dimmed-further", "panel_active_darker": "--arrowpanel-dimmed-even-further", - "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity" + "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity", + "input_border_color": "--input-border-color" } } } diff --git a/toolkit/mozapps/extensions/default-theme/manifest.json b/toolkit/mozapps/extensions/default-theme/manifest.json index 877d2e73853c..9646010b54d4 100644 --- a/toolkit/mozapps/extensions/default-theme/manifest.json +++ b/toolkit/mozapps/extensions/default-theme/manifest.json @@ -51,7 +51,7 @@ "button_primary_color": "rgb(43, 42, 51)", "error_text_color": "rgb(255, 154, 162)", "input_background": "#42414D", - "input_color": "#BFBFC9", + "input_color": "rgb(251,251,254)", "input_border": "#8f8f9d", "input_border_error": "rgb(255, 132, 138)", "zoom_controls": "rgb(74,74,85)",