[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch master updated: fix ugly language bar
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-www] branch master updated: fix ugly language bar |
Date: |
Tue, 14 Feb 2017 23:25:34 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 47236a1 fix ugly language bar
47236a1 is described below
commit 47236a1a9dee45b6d18467c1dc80998eced509e7
Author: Florian Dold <address@hidden>
AuthorDate: Tue Feb 14 23:25:13 2017 +0100
fix ugly language bar
---
common/navigation.j2.inc | 71 ++++++++++++++++++++++++++++-------------------
images/en.png | Bin 0 -> 1190 bytes
index.html.j2 | 14 +++++++++-
styles.css | 8 ++++++
4 files changed, 64 insertions(+), 29 deletions(-)
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index ab513e4..7635416 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,31 +1,46 @@
- <div class="navbar navbar-fixed-top navbar-taler" role="navigation">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse"
data-target="#main-navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
+<div class="navbar navbar-fixed-top navbar-taler" role="navigation">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse"
data-target="#main-navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div class="collapse navbar-collapse" id="main-navbar">
+ <ul class="nav nav-justified">
+ <li class="m_index"><a href="{{ url_localized('index.html') }}">{{
_("Home") }}</a></li>
+ <li class="m_demo"><a href="https://demo.taler.net/" target="_blank">{{
_("Demo") }}</a></li>
+ <li class="m_citizens"><a href="{{ url_localized('citizens.html') }}">{{
_("Citizens") }}</a></li>
+ <li class="m_merchants"><a href="{{ url_localized('merchants.html')
}}">{{ _("Merchants") }}</a></li>
+ <li class="m_governments"><a href="{{ url_localized('governments.html')
}}">{{ _("Governments") }}</a></li>
+ <li class="m_investors"><a href="{{ url_localized('investors.html')
}}">{{ _("Investors") }}</a></li>
+ <li class="m_developers"><a href="{{ url_localized('developers.html')
}}">{{ _("Developers") }}</a></li>
+ <li class="m_about"><a href="{{ url_localized('about.html') }}">{{
_("About us") }}</a></li>
+ <li>
+ <div class="dropdown">
+ <button class="btn btn-default dropdown-toggle" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="true">
+ <img src="{{ url('images/'+lang+'.png') }}"/></img>
+ <span class="caret"></span>
</button>
- </div>
- <div class="collapse navbar-collapse" id="main-navbar">
- <ul class="nav nav-justified">
- <li class="m_index"><a href="{{ url_localized('index.html') }}">{{
_("Home") }}</a></li>
- <li class="m_demo"><a href="https://demo.taler.net/"
target="_blank">{{ _("Demo") }}</a></li>
- <li class="m_citizens"><a href="{{ url_localized('citizens.html')
}}">{{ _("Citizens") }}</a></li>
- <li class="m_merchants"><a href="{{
url_localized('merchants.html') }}">{{ _("Merchants") }}</a></li>
- <li class="m_governments"><a href="{{
url_localized('governments.html') }}">{{ _("Governments") }}</a></li>
- <li class="m_investors"><a href="{{
url_localized('investors.html') }}">{{ _("Investors") }}</a></li>
- <li class="m_developers"><a href="{{
url_localized('developers.html') }}">{{ _("Developers") }}</a></li>
- <li class="m_about"><a href="{{ url_localized('about.html') }}">{{
_("About us") }}</a></li>
+ <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+ <li>
+ <a href="{{ self_localized('en') }}"><img src="{{
url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('de') }}"><img src="{{
url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('fr') }}"><img src="{{
url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('it') }}"><img src="{{
url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('es') }}"><img src="{{
url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
+ </li>
</ul>
</div>
- </div>
- <div class="navbar navbar-default navbar-fixed-bottom"
role="navigation">
- <div class="container lang-slector">
- <a href="{{ self_localized('en') }}"><img src="{{
url('images/gb.png') }}" height="15" width="23" alt="English"></a>
- <a href="{{ self_localized('de') }}"><img src="{{
url('images/de.png') }}" height="15" width="25" alt="Deutsch"></a>
- <a href="{{ self_localized('fr') }}"><img src="{{
url('images/fr.png') }}" height="15" width="22" alt="Français"></a>
- <a href="{{ self_localized('it') }}"><img src="{{
url('images/it.png') }}" height="15" width="22" alt="Italiano"></a>
- <a href="{{ self_localized('es') }}"><img src="{{
url('images/es.png') }}" height="15" width="23" alt="Español"></a>
- </div>
- </div>
+ </li>
+ </ul>
+ </div>
diff --git a/images/en.png b/images/en.png
new file mode 100644
index 0000000..ea14508
Binary files /dev/null and b/images/en.png differ
diff --git a/index.html.j2 b/index.html.j2
index fd3745f..f73e562 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -7,8 +7,9 @@
{% include "common/header.j2.inc" %}
</head>
<body>
+ {% include "common/navigation.j2.inc" %}
+
<div class="container">
- {% include "common/navigation.j2.inc" %}
<!-- Jumbotron -->
<div class="jumbotron">
<img align="middle" alt="Taler logo" width="33%" src="{{
url('images/logo-2015-medium.png') }}" style="margin: 0px 0px -120px 0px;">
@@ -24,6 +25,10 @@
") }}</p>
</div>
+ </div>
+
+ <div class="container-fluid c_description">
+ <div class="container">
<div class="row">
<div class="col-lg-4">
<h2>{{ _("<b>T</b>axable") }}</h2>
@@ -78,6 +83,13 @@
Bitcoins.") }}</p>
</div>
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row spacer">
+ </div>
+ <div class="row">
<div class="col-lg-4">
<h2>{{ _("Latest Videos") }}</h2>
<p>{{ _("Florian Dold talks about Taler at 50p!") }}</p>
diff --git a/styles.css b/styles.css
index b2c028d..1695596 100644
--- a/styles.css
+++ b/styles.css
@@ -8,3 +8,11 @@
html {
overflow-y: scroll;
}
+
+.spacer {
+ margin-top: 40px;
+}
+
+.c_description {
+ background-color: #c5ffd7;
+}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-www] branch master updated: fix ugly language bar,
gnunet <=