[taler-taler-merchant-demos] branch master updated: merge CSS

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository taler-merchant-demos.

The following commit(s) were added to refs/heads/master by this push:
     new ab2485e  merge CSS
ab2485e is described below

commit ab2485e90ee228c49357a99b4aeba45e5328270f
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Apr 22 15:58:42 2021 +0200

    merge CSS
---
 talermerchantdemos/static/demo.css               | 82 ++++++++++++++++++++++-
 talermerchantdemos/static/navbar.css             | 85 ------------------------
 talermerchantdemos/templates/blog-base.html.j2   |  4 ++
 talermerchantdemos/templates/common-base.html.j2 |  2 -
 4 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/talermerchantdemos/static/demo.css 
b/talermerchantdemos/static/demo.css
index c38e601..bdf9522 100644
--- a/talermerchantdemos/static/demo.css
+++ b/talermerchantdemos/static/demo.css
@@ -1,5 +1,6 @@
 @charset "UTF-8";
 /* style common to all demo pages */
+
 .demobar h1 {
   text-align: center;
 }
@@ -13,7 +14,6 @@
   color: inherit;
 }
 
-
 .tt {
   font-family: "Lucida Console", Monaco, monospace;
 }
@@ -77,3 +77,83 @@ body * {
     text-align: center;
   }
 }
+
+.navcontainer {
+  overflow: hidden;
+  background: #144;
+  margin-bottom: 50px;
+  width: 100%;
+  color: white;
+  position: -webkit-sticky;
+  position: sticky;
+  top: 0px;
+  width: 100vw;
+  backdrop-filter: blur(10px);
+  opacity: 1;
+  z-index: 10000;
+}
+
+nav {
+  left: 1vw;
+  position: relative;
+  background: #144;
+  z-index: 10000;
+}
+
+nav a,
+nav span,
+.navbtn {
+  border: none;
+  color: white;
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  font-size: 16px;
+  background: #00000000;
+  height: inherit;
+}
+
+nav a,
+nav span,
+.navbtn {
+  padding: 15px 32px;
+}
+
+nav a:hover,
+nav span:hover,
+.navbtn:hover {
+  background: #00000022;
+}
+
+nav a.active,
+nav span.active,
+.navbtn.active {
+  background-color: #3daee9;
+}
+
+nav a.active:hover,
+nav span.active:hover,
+.navbtn.active:hover {
+  background: #0042b2;
+}
+
+nav a,
+nav span,
+.navbtn {
+  cursor: pointer;
+}
+
+nav .right {
+  float: right;
+  margin-right: 5vw;
+}
+nav .right div.nav {
+  display: none;
+}
+nav .right div.nav:hover {
+  display: block;
+}
+
+nav .right:hover div.nav {
+  display: block;
+}
diff --git a/talermerchantdemos/static/navbar.css 
b/talermerchantdemos/static/navbar.css
deleted file mode 100644
index a2ba185..0000000
--- a/talermerchantdemos/static/navbar.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @author      Torsten Grothoff
- * @name        navbar.css
- * @description Makes the navigation bar have styles
- * @license     LGPL-3.0-or-later
- */
-.navcontainer {
-  overflow: hidden;
-  background: #144;
-  margin-bottom: 50px;
-  width: 100%;
-  color: white;
-  position: -webkit-sticky;
-  position: sticky;
-  top: 0px;
-  width: 100vw;
-  backdrop-filter: blur(10px);
-  opacity: 1;
-  z-index: 10000;
-}
-
-nav {
-  left: 1vw;
-  position: relative;
-  background: #144;
-  z-index: 10000;
-}
-
-nav a,
-nav span,
-.navbtn {
-  border: none;
-  color: white;
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  font-size: 16px;
-  background: #00000000;
-  height: inherit;
-}
-
-nav a,
-nav span,
-.navbtn {
-  padding: 15px 32px;
-}
-
-nav a:hover,
-nav span:hover,
-.navbtn:hover {
-  background: #00000022;
-}
-
-nav a.active,
-nav span.active,
-.navbtn.active {
-  background-color: #3daee9;
-}
-
-nav a.active:hover,
-nav span.active:hover,
-.navbtn.active:hover {
-  background: #0042b2;
-}
-
-nav a,
-nav span,
-.navbtn {
-  cursor: pointer;
-}
-
-nav .right {
-  float: right;
-  margin-right: 5vw;
-}
-nav .right div.nav {
-  display: none;
-}
-nav .right div.nav:hover {
-  display: block;
-}
-
-nav .right:hover div.nav {
-  display: block;
-}
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>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.