From ea458373726e7e3424617160aafcb3f7eacfd4e7 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 1 Nov 2020 14:29:03 -0800
Subject: [PATCH] Default CSS: avoid padding and color if monobackgroundcolor
 not given.

This makes the default more austere, while putting the padded,
colored code elements within easy reach.
---
 MANUAL.txt                 |  3 ++-
 data/templates/styles.html | 10 +++++++---
 test/lhs-test.html         |  4 ----
 test/lhs-test.html+lhs     |  4 ----
 test/writer.html4          |  4 ----
 test/writer.html5          |  4 ----
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index 74754e640..426aa5947 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -2215,7 +2215,8 @@ ODT or pptx.
 :   sets the CSS `font-family` property on `code` elements.
 
 `monobackgroundcolor`
-:   sets the CSS `background-color` property on `code` elements.
+:   sets the CSS `background-color` property on `code` elements
+    and adds extra padding.
 
 `linestretch`
 :   sets the CSS `line-height` property on the `html` element,
diff --git a/data/templates/styles.html b/data/templates/styles.html
index f70797f70..cd0354fdc 100644
--- a/data/templates/styles.html
+++ b/data/templates/styles.html
@@ -74,16 +74,20 @@ blockquote {
 }
 code {
   font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, 'Lucida Console', Consolas, monospace$endif$;
-  background-color: $if(monobackgroundcolor)$$monobackgroundcolor$$else$#f0f0f0$endif$;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: .2em .4em;
+$endif$
   font-size: 85%;
   margin: 0;
-  padding: .2em .4em;
 }
 pre {
   margin: 1.7em 0;
   line-height: 1.5em;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
   padding: 1em;
-  background-color: $if(monobackgroundcolor)$$monobackgroundcolor$$else$#f0f0f0$endif$;
+$endif$
   overflow: auto;
 }
 pre code {
diff --git a/test/lhs-test.html b/test/lhs-test.html
index 78bdb7238..888b38826 100644
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
@@ -81,16 +81,12 @@
     }
     code {
       font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
-      background-color: #f0f0f0;
       font-size: 85%;
       margin: 0;
-      padding: .2em .4em;
     }
     pre {
       margin: 1.7em 0;
       line-height: 1.5em;
-      padding: 1em;
-      background-color: #f0f0f0;
       overflow: auto;
     }
     pre code {
diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
index 90cb1fc0d..235bb499e 100644
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
@@ -81,16 +81,12 @@
     }
     code {
       font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
-      background-color: #f0f0f0;
       font-size: 85%;
       margin: 0;
-      padding: .2em .4em;
     }
     pre {
       margin: 1.7em 0;
       line-height: 1.5em;
-      padding: 1em;
-      background-color: #f0f0f0;
       overflow: auto;
     }
     pre code {
diff --git a/test/writer.html4 b/test/writer.html4
index f1f6e9c98..a74705151 100644
--- a/test/writer.html4
+++ b/test/writer.html4
@@ -84,16 +84,12 @@
     }
     code {
       font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
-      background-color: #f0f0f0;
       font-size: 85%;
       margin: 0;
-      padding: .2em .4em;
     }
     pre {
       margin: 1.7em 0;
       line-height: 1.5em;
-      padding: 1em;
-      background-color: #f0f0f0;
       overflow: auto;
     }
     pre code {
diff --git a/test/writer.html5 b/test/writer.html5
index cb33a106d..b5e65a4d7 100644
--- a/test/writer.html5
+++ b/test/writer.html5
@@ -84,16 +84,12 @@
     }
     code {
       font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
-      background-color: #f0f0f0;
       font-size: 85%;
       margin: 0;
-      padding: .2em .4em;
     }
     pre {
       margin: 1.7em 0;
       line-height: 1.5em;
-      padding: 1em;
-      background-color: #f0f0f0;
       overflow: auto;
     }
     pre code {