From de9b65d9eca6a2f9b2c3d09235f793799e6daada Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Fri, 14 May 2021 10:46:04 +0200
Subject: [PATCH] Squashed 'cgilite/' changes from 49b4c44..c207699

c207699 bugfix: fix error when reading literal "+" char from storage
e7e354d basic print styles
4b913ff set foreground color where background color is set

git-subtree-dir: cgilite
git-subtree-split: c207699d7f39ce4bf96139e25da61e13cb94be4c
---
 common.css | 21 +++++++++++++++++----
 storage.sh |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/common.css b/common.css
index 9e72c16..f9b17ad 100644
--- a/common.css
+++ b/common.css
@@ -60,7 +60,7 @@ h2 { font-size: 1.125em; }
 
 select, input, button, textarea, a.button {
   display: inline-block;
-  background-color: #FFF;
+  color: #000; background-color: #FFF;
   border: .5pt solid;
   padding: .25em .75em;
   vertical-align: text-bottom;
@@ -87,6 +87,20 @@ input + label {
   margin-left: .375em;
 }
 
+@media print {
+  @page { margin: 20mm; }
+
+  h1 { text-align: center; }
+
+  h1, h2, h3, h4, h5, h6, form legend {
+    page-break-inside: avoid;
+    page-break-after: avoid;
+    page-break-before: auto;
+  }
+  li { page-break-inside: avoid; }
+  th, dt { page-break-after: avoid; }
+}
+
 /* ======= End Generic Styles ======= */
 
 /* ======= Common Styles ======= */
@@ -97,8 +111,7 @@ input + label {
   bottom: -100%; left: 50%; transform: translate(-50%, 0);
   content: attr(tooltip);
   padding: .5em;
-  background-color: #FFC;
-  color: #000;
+  color: #000; background-color: #FFC;
   border: .5pt solid;
   z-index: 1;
 }
@@ -107,7 +120,7 @@ input[type=radio].tab { display: none; }
 input[type=radio].tab + label {
   display: table-cell;
   padding: .5em 1em;
-  background-color: #EEE;
+  color: #000; background-color: #EEE;
   border: .5pt solid;
 }
 input[type=radio].tab:checked + label {
diff --git a/storage.sh b/storage.sh
index 82d3d77..355bd56 100755
--- a/storage.sh
+++ b/storage.sh
@@ -105,7 +105,7 @@ UNSTRING(){
     \\n*) out="${out}${BR}"; in="${in#\\n}" ;;
     \\r*) out="${out}${CR}"; in="${in#\\r}" ;;
     \\t*) out="${out}	"; in="${in#\\t}" ;;
-    \\+) out="${out}+"; in="${in#\\+}" ;;
+    \\+*) out="${out}+"; in="${in#\\+}" ;;
     +*) out="${out} "; in="${in#+}" ;;
     \\*) in="${in#\\}" ;;
     *) out="${out}${in%%[\\+]*}"; in="${in#"${in%%[\\+]*}"}" ;;
-- 
2.39.2