From d05da0f267d22963616b5f7cc241541e62419cf1 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 18 Aug 2021 16:02:09 +0200
Subject: cosmetic fixes for merchant HTML pages

---
 contrib/merchant-backoffice     |  2 +-
 contrib/offer_refund.en.must    | 24 +++---------------------
 contrib/offer_tip.en.must       | 12 ++----------
 contrib/request_payment.en.must | 23 +++--------------------
 4 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 03c8c9b7..4320467d 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 03c8c9b794905878175d07366267bdc01c3795b9
+Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984
diff --git a/contrib/offer_refund.en.must b/contrib/offer_refund.en.must
index 57b4d55c..2eaaab44 100644
--- a/contrib/offer_refund.en.must
+++ b/contrib/offer_refund.en.must
@@ -28,14 +28,6 @@
         integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ"
         crossorigin="anonymous">
   <style>
-.taler::before {
-  content: "❬";
-  color: #aa3939;
-}
-.taler::after {
-  content: "❭";
-  color: #aa3939;
-}
 .talerbar {
   text-align: center;
 }
@@ -61,16 +53,6 @@
 .qrtext:hover {
     font-size: 1em;
 }
-.talerbar {
-    margin: 0;
-    bottom: 0;
-    background-color: #033;
-    color: white;
-    width: 100%;
-    padding: 1em;
-    overflow: auto;
-}
-
 body {
   overflow-y: scroll;
 }
@@ -127,9 +109,9 @@ body {
 </script>
 
 
-<h1><span class="taler">Taler</span> refund available</h1>
+<h1>Taler refund available</h1>
 
-<div class="taler-installed-hide">
+<div>
   <p>
   Please select your Taler wallet to obtain the refund.
   </p>
@@ -152,7 +134,7 @@ body {
 
 <div class="talerbar">
   <p>You can learn more about GNU Taler on our <a href="https://taler.net/">website</a>.<br>
-  Copyright &copy; 2014&mdash;2020 Taler Systems SA</p>
+  Copyright &copy; 2014&mdash;2021 Taler Systems SA</p>
 </div>
 </body>
 </html>
diff --git a/contrib/offer_tip.en.must b/contrib/offer_tip.en.must
index 4ae140cf..465093fe 100644
--- a/contrib/offer_tip.en.must
+++ b/contrib/offer_tip.en.must
@@ -28,14 +28,6 @@
         integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ"
         crossorigin="anonymous">
   <style>
-.taler::before {
-  content: "❬";
-  color: #aa3939;
-}
-.taler::after {
-  content: "❭";
-  color: #aa3939;
-}
 .talerbar {
   text-align: center;
 }
@@ -119,7 +111,7 @@ body {
 </script>
 
 
-<h1><span class="taler">Taler</span> tip available</h1>
+<h1>Taler tip available</h1>
 
 <div class="taler-installed-hide">
   <p>
@@ -144,7 +136,7 @@ body {
 
 <div class="talerbar">
   <p>You can learn more about GNU Taler on our <a href="https://taler.net/">website</a>.<br>
-  Copyright &copy; 2014&mdash;2020 Taler Systems SA</p>
+  Copyright &copy; 2014&mdash;2021 Taler Systems SA</p>
 </div>
 </body>
 </html>
diff --git a/contrib/request_payment.en.must b/contrib/request_payment.en.must
index f113faf0..e12532bd 100644
--- a/contrib/request_payment.en.must
+++ b/contrib/request_payment.en.must
@@ -22,20 +22,12 @@
   <noscript>
     <meta http-equiv="refresh" content="1">
   </noscript>
-  <title>Payment required for {{order_summary}}</title>
+  <title>Payment requested for {{order_summary}}</title>
   <link rel="stylesheet"
         href="{{static_url}}pure-min.css"
         integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ"
         crossorigin="anonymous">
   <style>
-.taler::before {
-  content: "❬";
-  color: #aa3939;
-}
-.taler::after {
-  content: "❭";
-  color: #aa3939;
-}
 .talerbar {
   text-align: center;
 }
@@ -61,15 +53,6 @@
 .qrtext:hover {
     font-size: 1em;
 }
-.talerbar {
-    margin: 0;
-    bottom: 0;
-    background-color: #033;
-    color: white;
-    width: 100%;
-    padding: 1em;
-    overflow: auto;
-}
 
 body {
   overflow-y: scroll;
@@ -152,7 +135,7 @@ body {
 <section id="main" class="content">
 
 
-<h1><span class="taler">Taler</span> payment required</h1>
+<h1>Taler payment requested</h1>
 
 <div class="taler-installed-hide">
   <p>
@@ -180,7 +163,7 @@ body {
 
 <div class="talerbar">
   <p>You can learn more about GNU Taler on our <a href="https://taler.net/">website</a>.<br>
-  Copyright &copy; 2014&mdash;2020 Taler Systems SA</p>
+  Copyright &copy; 2014&mdash;2021 Taler Systems SA</p>
 </div>
 </body>
 </html>
-- 
cgit v1.2.3