[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] branch master updated: new colors
From: |
gnunet |
Subject: |
[taler-taler-merchant-demos] branch master updated: new colors |
Date: |
Wed, 16 Mar 2022 14:08:30 +0100 |
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 5c5256c new colors
5c5256c is described below
commit 5c5256c5d18c6812e62673b5ce0c2a311ca7385a
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Mar 16 14:08:27 2022 +0100
new colors
---
.gitignore | 1 +
talermerchantdemos/static/colors-blog.css | 24 ++++++++++++++++++++++
talermerchantdemos/static/colors-donations.css | 24 ++++++++++++++++++++++
talermerchantdemos/static/colors-survey.css | 24 ++++++++++++++++++++++
talermerchantdemos/static/demo.css | 2 +-
talermerchantdemos/templates/blog-base.html.j2 | 1 +
talermerchantdemos/templates/common-base.html.j2 | 2 +-
.../templates/donations-base.html.j2 | 5 +++++
talermerchantdemos/templates/survey-base.html.j2 | 5 +++++
9 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index d7cf17a..23a69e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ config.mk
.sass-cache
dist/
.vscode
+*.mo
diff --git a/talermerchantdemos/static/colors-blog.css
b/talermerchantdemos/static/colors-blog.css
new file mode 100644
index 0000000..59890af
--- /dev/null
+++ b/talermerchantdemos/static/colors-blog.css
@@ -0,0 +1,24 @@
+nav,
+nav a,
+nav span,
+.navcontainer,
+.demobar,
+.navbtn {
+ color: white;
+ background: #385723;
+}
+
+nav a.active,
+nav span.active,
+.navbtn.active {
+ background-color: #233a13;
+}
+
+nav a.active:hover,
+nav span.active:hover,
+.navbtn.active:hover,
+nav a:hover,
+nav span:hover,
+.navbtn:hover {
+ background: #568636;
+}
diff --git a/talermerchantdemos/static/colors-donations.css
b/talermerchantdemos/static/colors-donations.css
new file mode 100644
index 0000000..bf96697
--- /dev/null
+++ b/talermerchantdemos/static/colors-donations.css
@@ -0,0 +1,24 @@
+nav,
+nav a,
+nav span,
+.navcontainer,
+.demobar,
+.navbtn {
+ color: white;
+ background: #843c0c;
+}
+
+nav a.active,
+nav span.active,
+.navbtn.active {
+ background-color: #522609;
+}
+
+nav a.active:hover,
+nav span.active:hover,
+.navbtn.active:hover,
+nav a:hover,
+nav span:hover,
+.navbtn:hover {
+ background: #b15213;
+}
diff --git a/talermerchantdemos/static/colors-survey.css
b/talermerchantdemos/static/colors-survey.css
new file mode 100644
index 0000000..9377331
--- /dev/null
+++ b/talermerchantdemos/static/colors-survey.css
@@ -0,0 +1,24 @@
+nav,
+nav a,
+nav span,
+.navcontainer,
+.demobar,
+.navbtn {
+ color: white;
+ background: #ffaf00;
+}
+
+nav a.active,
+nav span.active,
+.navbtn.active {
+ background-color: #6e5e3c;
+}
+
+nav a.active:hover,
+nav span.active:hover,
+.navbtn.active:hover,
+nav a:hover,
+nav span:hover,
+.navbtn:hover {
+ background: #b88d31;
+}
diff --git a/talermerchantdemos/static/demo.css
b/talermerchantdemos/static/demo.css
index d6fb5a0..53ec986 100644
--- a/talermerchantdemos/static/demo.css
+++ b/talermerchantdemos/static/demo.css
@@ -2,7 +2,7 @@
/*
Style common to all demo pages.
-Colors:
+Colors (Taler / landing):
- #1e2739 (dark blue)
- #0042b2 (default blue)
- #3daee9 (highlight blue)
diff --git a/talermerchantdemos/templates/blog-base.html.j2
b/talermerchantdemos/templates/blog-base.html.j2
index abe3158..a320f0f 100644
--- a/talermerchantdemos/templates/blog-base.html.j2
+++ b/talermerchantdemos/templates/blog-base.html.j2
@@ -2,6 +2,7 @@
{% block head %}
<link rel="stylesheet" type="text/css" href="{{ static('blog.css') }}" />
+ <link rel="stylesheet" type="text/css" href="{{ static('colors-blog.css')
}}" />
{% endblock head %}
{% block header_content %}
diff --git a/talermerchantdemos/templates/common-base.html.j2
b/talermerchantdemos/templates/common-base.html.j2
index 2a6be8c..07fd5c9 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -86,7 +86,7 @@
}}
</p>
<div style="flex-grow:1"></div>
- <p>Copyright © 2014—2021 Taler Systems SA</p>
+ <p>Copyright © 2014—2022 Taler Systems SA</p>
</div>
</section>
</body>
diff --git a/talermerchantdemos/templates/donations-base.html.j2
b/talermerchantdemos/templates/donations-base.html.j2
index 9f772a4..aec8794 100644
--- a/talermerchantdemos/templates/donations-base.html.j2
+++ b/talermerchantdemos/templates/donations-base.html.j2
@@ -1,5 +1,10 @@
{% extends "common-base.html.j2" %}
+{% block head %}
+ <link rel="stylesheet" type="text/css" href="{{
static('colors-donations.css') }}" />
+{% endblock head %}
+
+
{% block header_content %}
<h1>
diff --git a/talermerchantdemos/templates/survey-base.html.j2
b/talermerchantdemos/templates/survey-base.html.j2
index f35f514..1ec97be 100644
--- a/talermerchantdemos/templates/survey-base.html.j2
+++ b/talermerchantdemos/templates/survey-base.html.j2
@@ -1,5 +1,10 @@
{% extends "common-base.html.j2" %}
+{% block head %}
+ <link rel="stylesheet" type="text/css" href="{{ static('colors-survey.css')
}}" />
+{% endblock head %}
+
+
{% block header_content %}
<h1>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-merchant-demos] branch master updated: new colors,
gnunet <=