From ab2485e90ee228c49357a99b4aeba45e5328270f Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 22 Apr 2021 15:58:42 +0200
Subject: merge CSS

---
 talermerchantdemos/templates/blog-base.html.j2   | 4 ++++
 talermerchantdemos/templates/common-base.html.j2 | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'talermerchantdemos/templates')

diff --git a/talermerchantdemos/templates/blog-base.html.j2 b/talermerchantdemos/templates/blog-base.html.j2
index e533bd4..cbccf86 100644
--- a/talermerchantdemos/templates/blog-base.html.j2
+++ b/talermerchantdemos/templates/blog-base.html.j2
@@ -1,5 +1,9 @@
 {% extends "common-base.html.j2" %}
 
+{% block head %}
+
+{% endblock head %}
+  <link rel="stylesheet" type="text/css" href="{{ static('torsten.css') }}" />
 {% block header_content %}
 
 <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">{{ gettext("Essay shop") }}</a></span></h1>
diff --git a/talermerchantdemos/templates/common-base.html.j2 b/talermerchantdemos/templates/common-base.html.j2
index a90c64c..a1475eb 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -20,8 +20,6 @@
   <title>{{ page_title | default(gettext("GNU Taler Demo")) }}</title>
   <link rel="stylesheet" type="text/css" href="{{ static('pure.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ static('demo.css') }}" />
-  <link rel="stylesheet" type="text/css" href="{{ static('navbar.css') }}" />
-  <link rel="stylesheet" type="text/css" href="{{ static('torsten.css') }}" />
   {% block head %}
   {% endblock %}
 </head>
-- 
cgit v1.2.3