taler-merchant-demos

commit 0f393b59b3651c9d8b19ef5d1cd0d2f2255ea29c
parent 36698922c39c207c9f1e081027c4c2d3e9a334ec
Author: Florian Dold <florian@dold.me>
Date:   Fri, 23 Apr 2021 11:36:19 +0200

layout/css tweaks

Diffstat:
A
talermerchantdemos/static/blog.css
 | 
20
++++++++++++++++++++
M
talermerchantdemos/static/demo.css
 | 
32
++------------------------------
D
talermerchantdemos/static/torsten.css
 | 
47
-----------------------------------------------
M
talermerchantdemos/templates/blog-base.html.j2
 | 
2
+-
M
talermerchantdemos/templates/blog-index.html.j2
 | 
6
++----

5 files changed, 25 insertions(+), 82 deletions(-)
diff --git a/talermerchantdemos/static/blog.css b/talermerchantdemos/static/blog.css
@@ -0,0 +1,20 @@
+.notice {
+  border-radius: 1em;
+  background: rgb(228, 228, 228);
+  border-left: 0.3em solid #1e2739;
+  padding-left: 1em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  margin-top: 2em;
+  margin-bottom: 2em;
+}
+.notice {
+  position: relative;
+  left: 0;
+}
+#main a:link,
+#main a:visited,
+#main a:hover,
+#main a:active {
+  color: black;
+}
diff --git a/talermerchantdemos/static/demo.css b/talermerchantdemos/static/demo.css
@@ -31,12 +31,13 @@
 }
 
 .content {
+  margin-left: 2em;
   overflow-x: auto;
 }
 
 .demobar {
   overflow-x: auto;
-  background-color: #033;
+  background-color: #1e2739;
   color: white;
 }
 
@@ -45,35 +46,6 @@ body {
   overflow-y: auto;
 }
 
-body * {
-  /* margin-left: 0.5vw; */
-  left: 0.1vw;
-}
-
-@media (min-width: 500px) {
-  .content {
-    /* margin-left: 0vw; */
-    padding-left: 2em;
-    margin-right: 1em;
-  }
-
-  .demobar {
-    /* height: 100%; */
-    /* width: 25%; */
-    /* NOTE: Please use "vh"/"vw" instead of "%" when possible, in the future. */
-    height: min-content;
-    width: 100vw;
-    margin: 0;
-    top: 0;
-    left: 0;
-    background-color: #1e2739;
-    color: white;
-    position: relative;
-    padding-right: 1em;
-    text-align: center;
-  }
-}
-
 .navcontainer {
   background: #1e2739;
   margin-bottom: 50px;
diff --git a/talermerchantdemos/static/torsten.css b/talermerchantdemos/static/torsten.css
@@ -1,47 +0,0 @@
-.warn {
-  background-color: #aa393977;
-  padding: 1em;
-}
-@keyframes hoveranim {
-  from {
-    left: 0;
-  }
-  to {
-    left: 1vw;
-  }
-}
-@keyframes hoveranimrevert {
-  from {
-    left: 1vw;
-  }
-  to {
-    left: 0;
-  }
-}
-.notice {
-  border-radius: 1em;
-  background: #0333;
-  border-left: 0.3em solid #033;
-  padding-left: 1em;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  margin-top: 2em;
-  margin-bottom: 2em;
-}
-.notice {
-  position: relative;
-  left: 0;
-  animation-name: hoveranimrevert;
-  animation-duration: 1s;
-}
-.notice:hover {
-  left: 1vw;
-  animation-name: hoveranim;
-  animation-duration: 1s;
-}
-#main a:link,
-#main a:visited,
-#main a:hover,
-#main a:active {
-  color: black;
-}
diff --git a/talermerchantdemos/templates/blog-base.html.j2 b/talermerchantdemos/templates/blog-base.html.j2
@@ -1,7 +1,7 @@
 {% extends "common-base.html.j2" %}
 
 {% block head %}
-  <link rel="stylesheet" type="text/css" href="{{ static('torsten.css') }}" />
+  <link rel="stylesheet" type="text/css" href="{{ static('blog.css') }}" />
 {% endblock head %}
 
 {% block header_content %}
diff --git a/talermerchantdemos/templates/blog-index.html.j2 b/talermerchantdemos/templates/blog-index.html.j2
@@ -17,10 +17,8 @@
 
     <h2>{{ gettext("Chapters") }} </h2>
     <div>
-      {{
-      gettext("Click on an individual chapter to to purchase it with GNU Taler.") +
-      gettext('You can get free, virtual money to buy articles on this page at the <a href="{}")">bank</a>').format(env('TALER_ENV_URL_BANK'))
-      }}
+      {{ gettext("Click on an individual chapter to to purchase it with GNU Taler.") }}
+      {{ gettext('You can get free, virtual money to buy articles on this page at the <a href="{}")">bank</a>.').format(env('TALER_ENV_URL_BANK')) }}
     </div>
 
     <div>