diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-09-06 18:48:48 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-09-06 18:48:48 +0200 |
| commit | 06c708def001b20b6e15d02c5224d835559e4f71 (patch) | |
| tree | 7be3fd806190087ca30e631e7d1846dbba4d7141 /talermerchantdemos/blog/templates | |
| parent | d6459ab53ef80f1c799324ea5fa9709f6652db38 (diff) | |
| parent | 3b378dd884ffd9580e95d0b20964eb57b87f7552 (diff) | |
| download | taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.tar.gz taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.tar.bz2 taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.zip | |
fix merge issue
Diffstat (limited to 'talermerchantdemos/blog/templates')
| -rw-r--r-- | talermerchantdemos/blog/templates/base.html | 63 | ||||
| -rw-r--r-- | talermerchantdemos/blog/templates/index.html | 2 |
2 files changed, 52 insertions, 13 deletions
diff --git a/talermerchantdemos/blog/templates/base.html b/talermerchantdemos/blog/templates/base.html index 3d7d0f0..114b08a 100644 --- a/talermerchantdemos/blog/templates/base.html +++ b/talermerchantdemos/blog/templates/base.html @@ -23,11 +23,20 @@ <title>Taler Essay Shop Demo</title> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" /> + <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" /> <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; @@ -38,16 +47,28 @@ 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 styles %}{% endblock %} {% block scripts %}{% endblock %} </head> <body> - <div class="demobar" style="display: flex; flex-direction: column;"> + <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="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">Shop</a></span></h1> <p>On this page you can buy articles using an imaginary currency (for now). @@ -56,24 +77,42 @@ <a href="http://shop.fsf.org/product/free-software-free-society-2/">published by the FSF</a> and available gratis at <a href="http://www.gnu.org/">gnu.org</a>. </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 style="flex-grow:1"></div> - <p>Copyright © 2014—2018 Inria</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', '#') }}">Bank</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}" class="active">Essay Shop</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}">Donations</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">Tipping/Survey</a> + <a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') }}">Back-office</a> + <span class="right"> + Language + <!-- <input type="checkbox"> --> + <div class="nav"> + <br> + <a href="" class="navbtn">EN</a><br> + <a href="" class="navbtn">DE</a><br> + <a href="" class="navbtn">FR</a><br> + <a href="" class="navbtn">IT</a><br> + <a href="" class="navbtn">JP</a> + </div> + </span> + </nav> </div> + <!-- <input type="checkbox" class="r"><label>test</label> --> <section id="main" class="content"> {% block main %} This is the main content of the page. {% 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> + diff --git a/talermerchantdemos/blog/templates/index.html b/talermerchantdemos/blog/templates/index.html index 0702bf7..e139bd2 100644 --- a/talermerchantdemos/blog/templates/index.html +++ b/talermerchantdemos/blog/templates/index.html @@ -31,7 +31,7 @@ <div> {% for article in articles %} <div class="notice"> - <h3><a href="{{ url_for('article', lang=article.lang, article_name=article.slug) }}">{{article.title}}</a></h3> + <h3><a href="{{ url_for('article', lang=article.lang, article_name=article.slug) }}" class="articleTitle">{{article.title}}</a></h3> <p>{{ article.teaser|safe }} <a href="{{ url_for('article', lang=article.lang, article_name=article.slug) }}">(Pay to read more...)</a></p> </div> {% else %} |