aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-06-27 11:28:57 +0000
committerng0 <ng0@n0.is>2019-06-27 11:28:57 +0000
commit45d0b0364129481f518eebb0e6d97fdf82499959 (patch)
treecc3da6461058e1d87a860329575f11612e141cee /common
parent45a68c74b49b33830c5dc22e827e1fe02841c8c6 (diff)
downloadwww-45d0b0364129481f518eebb0e6d97fdf82499959.tar.gz
www-45d0b0364129481f518eebb0e6d97fdf82499959.zip
style change, layout fixes, start using sass.
Diffstat (limited to 'common')
-rw-r--r--common/base.j22
-rw-r--r--common/footer.j2.inc17
-rw-r--r--common/navigation.j2.inc8
3 files changed, 15 insertions, 12 deletions
diff --git a/common/base.j2 b/common/base.j2
index 855956b2..70034222 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -9,7 +9,7 @@
9 </head> 9 </head>
10 <body id="mybody"> 10 <body id="mybody">
11 {% include "common/navigation.j2.inc" %} 11 {% include "common/navigation.j2.inc" %}
12 <div id="body_content"> 12 <div id="body_content" class="bg-near-white">
13 {% block body_content %}{% endblock %} 13 {% block body_content %}{% endblock %}
14 </div> 14 </div>
15 {% include "common/footer.j2.inc" %} 15 {% include "common/footer.j2.inc" %}
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 5afdc45e..5586adf4 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,5 +1,5 @@
1<footer id="footer"> 1<footer id="footer" class="near-white bg-near-black">
2 <div class="container-fluid cushion-below"> 2 <div class="container-fluid">
3 <div class="container"> 3 <div class="container">
4 <div class="row"> 4 <div class="row">
5 <div class="col-12 col-sm-4"> 5 <div class="col-12 col-sm-4">
@@ -13,13 +13,13 @@
13 <div class="col-12 col-sm-4"> 13 <div class="col-12 col-sm-4">
14 <ul class="footer-list"> 14 <ul class="footer-list">
15 <li><p><a href="https://bugs.gnunet.org/">{{ _("Bug Tracker") }}</a></p></li> 15 <li><p><a href="https://bugs.gnunet.org/">{{ _("Bug Tracker") }}</a></p></li>
16 <li><p><a href="https://irc.gnunet.org/gnunet">{{ _("IRC archive") }}</a></p></li> 16 <!-- <li><p><a href="https://irc.gnunet.org/gnunet">{{ _("IRC archive") }}</a></p></li> -->
17 </ul> 17 </ul>
18 </div> 18 </div>
19 <div class="col-12 col-sm-4"> 19 <div class="col-12 col-sm-4">
20 <ul class="footer-list"> 20 <ul class="footer-list">
21 <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li> 21 <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li>
22 <li><p><a href="https://gitlab.gnunet.org/">{{ _("Continuous Integration") }}</a></p></li> 22 <!-- <li><p><a href="https://gitlab.gnunet.org/">{{ _("Continuous Integration") }}</a></p></li> -->
23 <li><p><a href="https://bib.gnunet.org/">{{ _("Bibliography") }}</a></p></li> 23 <li><p><a href="https://bib.gnunet.org/">{{ _("Bibliography") }}</a></p></li>
24 </ul> 24 </ul>
25 </div> 25 </div>
@@ -29,10 +29,11 @@
29 <div class="container text-center"> 29 <div class="container text-center">
30 <p> 30 <p>
31 {% trans %} 31 {% trans %}
32 Copyright &copy; <a href="ev.html">GNUnet e.V.</a> 2015, 2016, 2017, 2018, 2019<br> 32 Copyright &copy; <a href="ev.html">GNUnet e.V.</a> 2015 &mdash; 2019.
33 This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> 33 <!-- This just takes up space no one is interested in: -->
34 <a href='https://git.gnunet.org/www.git'>Source code of this site.</a><br /> 34 <!-- This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.<br> -->
35 Report issues with this website to <a href='contact.html'>us</a>. 35 <a href='https://git.gnunet.org/www.git'>Source code of this site.</a>
36 <a href='contact.html'>Report issues with this website</a>.
36 {% endtrans %} 37 {% endtrans %}
37 </p> 38 </p>
38 </div> 39 </div>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 4243db7b..e187d1ec 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -17,14 +17,16 @@
17</noscript> 17</noscript>
18<!-- <nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark"> --> 18<!-- <nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark"> -->
19<!--<nav class="navbar navbar-expand-md navar-inverse navbar-dark bg-dark fixed-top"> --> 19<!--<nav class="navbar navbar-expand-md navar-inverse navbar-dark bg-dark fixed-top"> -->
20<nav class="navbar navbar-expand-md fixed-top"> 20 <!-- <nav class="navbar navbar-expand-md fixed-top"> -->
21<nav class="navbar navbar-expand-md bg-near-black">
21 <a class="navbar-brand" href="index.html"> 22 <a class="navbar-brand" href="index.html">
22 <!-- 23 <!--
23 TODO: imo this is bad in the navbar. 24 TODO: imo this is bad in the navbar.
24 a readable "gnunet" font-logo would 25 a readable "gnunet" font-logo would
25 be better for orientation. 26 be better for orientation.
26 --> 27 -->
27 <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" /> 28 <!-- <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" /> -->
29 <h1>GNUnet</h1>
28 </a> 30 </a>
29 31
30 <!-- menu button --> 32 <!-- menu button -->
@@ -40,7 +42,7 @@
40 <!-- /menu button --> 42 <!-- /menu button -->
41 43
42 <!-- navbar --> 44 <!-- navbar -->
43 <div class="collapse navbar-collapse" id="navbarMain"> 45 <div class="collapse navbar-collapse bg-near-black" id="navbarMain">
44 <ul class="navbar-nav mr-auto nav"> 46 <ul class="navbar-nav mr-auto nav">
45 <li class="nav-item dropdown"> 47 <li class="nav-item dropdown">
46 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" 48 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 02:31:56 +0000