[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-bank] branch master updated: adopt bank style to match rest of de
|
From: |
gnunet |
|
Subject: |
[taler-bank] branch master updated: adopt bank style to match rest of demo |
|
Date: |
Sun, 11 Oct 2020 20:42:10 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 31e0204 adopt bank style to match rest of demo
31e0204 is described below
commit 31e02043ff230b474876682663ee93ec38209dd4
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Oct 11 20:42:08 2020 +0200
adopt bank style to match rest of demo
---
setup.py | 2 +-
talerbank/app/static/web-common | 2 +-
talerbank/app/templates/base.html | 81 ++++++++++++++++++++++++++++++---------
3 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/setup.py b/setup.py
index 5e140f9..1d81207 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup, find_packages
setup(name='talerbank',
- version='0.6.0pre1',
+ version='0.8.0',
description='Taler friendly bank',
url='git://taler.net/bank',
author='Marcello Stanisci, Florian Dold',
diff --git a/talerbank/app/static/web-common b/talerbank/app/static/web-common
index e9554ba..f95734d 160000
--- a/talerbank/app/static/web-common
+++ b/talerbank/app/static/web-common
@@ -1 +1 @@
-Subproject commit e9554baf0f3f880d656284ef5e9089bbd8313464
+Subproject commit f95734d1af533a87421d493e8cadfd1ed678d2cb
diff --git a/talerbank/app/templates/base.html
b/talerbank/app/templates/base.html
index 2015cf5..de65617 100644
--- a/talerbank/app/templates/base.html
+++ b/talerbank/app/templates/base.html
@@ -1,7 +1,7 @@
<!doctype html>
<!--
This file is part of GNU TALER.
- Copyright (C) 2014, 2015, 2016 Taler Systems SA
+ Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free
Software
@@ -23,30 +23,75 @@
<title>{{ settings_value("TALER_CURRENCY") }} Bank - Taler Demo</title>
<link rel="stylesheet" type="text/css" href="{{
static('web-common/pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{
static('web-common/demo.css') }}" />
- <link rel="stylesheet" type="text/css" href="{{
static('web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" />
+ <link rel="stylesheet" type="text/css" href="{{
static('web-common/navbar.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ static('bank.css') }}" />
- {% block head %} {% endblock %}
+ <style>
+ .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;
+ }
+ </style>
+ {% block head %} {% endblock %}
</head>
<body>
- <div class="demobar">
+ <header class="demobar" style="display: flex; flex-direction: column;">
<h1><span class="tt adorn-brackets">Taler Demo</span></h1>
<h1><span class="it"><a href="{{ url('index') }}">Bank</a></span></h1>
- <p>This part of the demo shows how a bank that supports Taler directly
would work. In addition to
- using your own bank account, you can also see the transaction history of
some <a href="{{ url('public-accounts') }}">Public Accounts</a>.</p>
- <p>Other parts of the demo:</p>
- <ul>
- <li><a href="{{ env('TALER_ENV_URL_INTRO', '#')
}}">Introduction</a></li>
- <li><a href="{{ env('TALER_ENV_URL_BANK', '#') }}">Bank</a></li>
- <li><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">Essay
Shop</a></li>
- <li><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">Donations</a></li>
- <li><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#')
}}">Tipping/Survey</a></li>
- <li><a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#')
}}">Back-office</a></li>
- </ul>
- <p>You can learn more about Taler on our main <a
href="https://taler.net";>website</a>.</p>
- </div>
- <div class="content">
+ <p>This part of the demo shows how a bank that supports Taler directly
would work.
+ In addition to using your own bank account, you can also see the
transaction
+ history of some <a href="{{ url('public-accounts') }}">Public
Accounts</a>.
+ </p>
+ </header>
+ <div style="display:flex; flex-direction: column;" class="navcontainer">
+ <nav class="demolist">
+ <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a>
+ <a href="{{ env('TALER_ENV_URL_BANK', '#') }}" class="active">Bank</a>
+ <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">Essay Shop</a>
+ <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">Donations</a>
+ <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#')
}}">Tipping/Survey</a>
+ </nav>
+ </div>
+ <section id="main" class="content">
{% block headermsg %} {% endblock %}
{% block content %} {% endblock %}
+ <hr />
+ <div>
+ <p>You can learn more about Taler on our main <a
href="https://taler.net/";>website</a>.</p>
+ <div style="flex-grow:1"></div>
+ <p>Copyright © 2014—2020 Taler Systems SA</p>
</div>
+ </section>
</body>
</html>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-bank] branch master updated: adopt bank style to match rest of demo,
gnunet <=