[evolution/gnome-3-34] I#659 - Hardcoded text colors do not work well in dark mode

[Milan Crha <mcrha src gnome org>]

commit 52a0b150cb5ef167316828d8776a68d16e42e052
Author: Milan Crha <mcrha redhat com>
Date:   Tue Oct 15 15:58:34 2019 +0200

    I#659 - Hardcoded text colors do not work well in dark mode
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/659

 src/e-util/e-web-view.c                        |  2 +-
 src/em-format/e-mail-formatter-secure-button.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/e-util/e-web-view.c b/src/e-util/e-web-view.c
index 5caa586a6c..79ac1ecfb3 100644
--- a/src/e-util/e-web-view.c
+++ b/src/e-util/e-web-view.c
@@ -2027,7 +2027,7 @@ web_view_submit_alert (EAlertSink *alert_sink,
                " cellpadding='1' cellspacing='0'>"
                "<tr>"
                "<td>"
-               "<table bgcolor='#dddddd' width='100%' cellpadding='6'>"
+               "<table bgcolor='#dddddd' width='100%' cellpadding='6' style=\"color:#000000;\">"
                "<tr>");
 
        g_string_append_printf (
diff --git a/src/em-format/e-mail-formatter-secure-button.c b/src/em-format/e-mail-formatter-secure-button.c
index 2715566030..4651f34bbe 100644
--- a/src/em-format/e-mail-formatter-secure-button.c
+++ b/src/em-format/e-mail-formatter-secure-button.c
@@ -254,16 +254,18 @@ secure_button_format_validity (EMailPart *part,
 
        g_string_append (html, "<table width=\"100%\" style=\"margin-bottom:4px; vertical-align:middle;");
        if (validity->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE &&
-           smime_sign_colour[info_index].alpha > 1e-9)
-               g_string_append_printf (html, " background:#%06x;",
-                       e_rgba_to_value (&smime_sign_colour[info_index]));
+           smime_sign_colour[info_index].alpha > 1e-9) {
+               g_string_append_printf (html, " background:#%06x; color:#%06x;",
+                       e_rgba_to_value (&smime_sign_colour[info_index]),
+                       e_rgba_to_value (&smime_sign_colour[5]));
+       }
        g_string_append (html, "\"><tr>");
 
        g_string_append_printf (html,
                "<td style=\"width:1px;\"><button type=\"button\" class=\"secure-button\" 
id=\"secure-button\" value=\"%p:%p\" accesskey=\"\" style=\"vertical-align:middle;\">"
-               "<img src=\"gtk-stock://%s?size=%d\" width=\"%dpx\" height=\"%dpx\" 
style=\"vertical-align:middle;\"></button></td><td><span style=\"color:#%06x; vertical-align:middle;\">",
+               "<img src=\"gtk-stock://%s?size=%d\" width=\"%dpx\" height=\"%dpx\" 
style=\"vertical-align:middle;\"></button></td><td><span style=\"vertical-align:middle;\">",
                part, validity, icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR,
-               icon_width, icon_height, e_rgba_to_value (&smime_sign_colour[5]));
+               icon_width, icon_height);
 
        g_queue_foreach (&validity->sign.signers, add_photo_cb, html);
        g_queue_foreach (&validity->encrypt.encrypters, add_photo_cb, html);