From 0e6ba162b22ca64b323ed9071c64a3e31b93c0f6 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 24 Feb 2020 21:54:05 +0000 Subject: Internal content: Restyle certificate viewer page. --- content/fetchers/about.c | 50 +++++++++++++++++++++++++++++++++++++++++------- resources/internal.css | 3 ++- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/content/fetchers/about.c b/content/fetchers/about.c index c140fdec0..aa68fd2b1 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -31,6 +31,8 @@ #include #include +#include "netsurf/plot_style.h" + #include "utils/log.h" #include "testament.h" #include "utils/corestrings.h" @@ -44,6 +46,8 @@ #include "content/fetchers/about.h" #include "image/image_cache.h" +#include "desktop/system_colour.h" + struct fetch_about_context; typedef bool (*fetch_about_handler)(struct fetch_about_context *); @@ -577,6 +581,28 @@ static bool fetch_about_certificate_handler(struct fetch_about_context *ctx) nserror res; struct cert_chain *chain = NULL; + colour bg; + colour fg; + colour border; + colour outside; + + res = ns_system_colour_char("Window", &bg); + if (res != NSERROR_OK) { + return false; + } + + res = ns_system_colour_char("WindowText", &fg); + if (res != NSERROR_OK) { + return false; + } + + outside = mix_colour(fg, bg, 0x0c); + border = mix_colour(fg, bg, 0x40); + + bg = colour_rb_swap(bg); + fg = colour_rb_swap(fg); + border = colour_rb_swap(border); + outside = colour_rb_swap(outside); /* content is going to return ok */ fetch_set_http_code(ctx->fetchh, code); @@ -587,17 +613,27 @@ static bool fetch_about_certificate_handler(struct fetch_about_context *ctx) /* page head */ res = ssenddataf(ctx, - "\n\n" + "\n\n" "NetSurf Browser Certificate Viewer\n" "\n" + "href=\"resource:internal.css\">\n" + "\n" "\n" "\n" - "\n" - "

NetSurf Browser Certificate Viewer

\n"); + "

Certificate

\n", + outside, fg, bg, border, border); if (res != NSERROR_OK) { goto fetch_about_certificate_handler_aborted; } diff --git a/resources/internal.css b/resources/internal.css index f98f0cc3d..8dcc7cf86 100644 --- a/resources/internal.css +++ b/resources/internal.css @@ -40,7 +40,8 @@ h1 { h2 { font-size: 160%; padding-top: 5mm; - border-top: 1px solid black; } + border-top-width: 1px; + border-top-style: solid; } h3 { font-size: 140%; -- cgit v1.2.3