summaryrefslogtreecommitdiff
path: root/talermerchantdemos/templates
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-04-22 15:58:42 +0200
committerFlorian Dold <florian@dold.me>2021-04-22 15:58:42 +0200
commitab2485e90ee228c49357a99b4aeba45e5328270f (patch)
tree89236f8f38dd1b88cd8d88c0814f56f7011264bc /talermerchantdemos/templates
parent8b64daca2bb022bfcfd1548195aa5c59ce1a7c00 (diff)
downloadtaler-merchant-demos-ab2485e90ee228c49357a99b4aeba45e5328270f.tar.gz
taler-merchant-demos-ab2485e90ee228c49357a99b4aeba45e5328270f.tar.bz2
taler-merchant-demos-ab2485e90ee228c49357a99b4aeba45e5328270f.zip
merge CSS
Diffstat (limited to 'talermerchantdemos/templates')
-rw-r--r--talermerchantdemos/templates/blog-base.html.j24
-rw-r--r--talermerchantdemos/templates/common-base.html.j22
2 files changed, 4 insertions, 2 deletions
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>