From 92cf6734a1b7bf0b4db9bd862e4937dbc10dec6e Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 7 Oct 2015 21:08:14 +0100
Subject: [PATCH] hgweb: ensure both foreground and background colors are
 specified (issue4872)

When users configure the default foreground or background color to
non-default (black on white) values, several hgweb styles lack
contrast for headers and table row items. This patch fixes that by
ensuring that where either foreground or background colors are
specified, both are specified.
---
 mercurial/templates/static/style-gitweb.css | 2 +-
 mercurial/templates/static/style-paper.css  | 1 +
 mercurial/templates/static/style.css        | 4 ++--
 tests/test-hgweb-commands.t                 | 4 ++--
 tests/test-hgweb.t                          | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mercurial/templates/static/style-gitweb.css b/mercurial/templates/static/style-gitweb.css
index 29aafc9fd5..f8579c02fe 100644
--- a/mercurial/templates/static/style-gitweb.css
+++ b/mercurial/templates/static/style-gitweb.css
@@ -1,4 +1,4 @@
-body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css
index 3659228f45..61f05a1cd7 100644
--- a/mercurial/templates/static/style-paper.css
+++ b/mercurial/templates/static/style-paper.css
@@ -2,6 +2,7 @@ body {
   margin: 0;
   padding: 0;
   background: white;
+  color: black;
   font-family: sans-serif;
 }
 
diff --git a/mercurial/templates/static/style.css b/mercurial/templates/static/style.css
index dd0ed28e59..51f760d2fc 100644
--- a/mercurial/templates/static/style.css
+++ b/mercurial/templates/static/style.css
@@ -2,8 +2,8 @@ a { text-decoration:none; }
 .age { white-space:nowrap; }
 .date { white-space:nowrap; }
 .indexlinks { white-space:nowrap; }
-.parity0 { background-color: #ddd; }
-.parity1 { background-color: #eee; }
+.parity0 { background-color: #ddd; color: #000; }
+.parity1 { background-color: #eee; color: #000; }
 .lineno { width: 60px; color: #aaa; font-size: smaller;
           text-align: right; }
 .plusline { color: green; }
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
index 71753c08c1..a7b1757ea0 100644
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -1944,8 +1944,8 @@ Static files
   .age { white-space:nowrap; }
   .date { white-space:nowrap; }
   .indexlinks { white-space:nowrap; }
-  .parity0 { background-color: #ddd; }
-  .parity1 { background-color: #eee; }
+  .parity0 { background-color: #ddd; color: #000; }
+  .parity1 { background-color: #eee; color: #000; }
   .lineno { width: 60px; color: #aaa; font-size: smaller;
             text-align: right; }
   .plusline { color: green; }
diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t
index ce3421fc99..3839baf940 100644
--- a/tests/test-hgweb.t
+++ b/tests/test-hgweb.t
@@ -340,10 +340,10 @@ static file
 
   $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server
   200 Script output follows
-  content-length: 6379
+  content-length: 6412
   content-type: text/css
   
-  body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+  body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
   a { color:#0000cc; }
   a:hover, a:visited, a:active { color:#880000; }
   div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }