aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-15 15:17:53 +0000
committerng0 <ng0@n0.is>2019-02-15 15:17:53 +0000
commita9ef3374ef27573145442b17514a182f9db19fbc (patch)
tree6e0085a4b656b1ee4869dd66869eedbf9ab0249a
parente2820c5804655b17eaa570a425701a6ec5cf014b (diff)
downloadwww-a9ef3374ef27573145442b17514a182f9db19fbc.tar.gz
www-a9ef3374ef27573145442b17514a182f9db19fbc.zip
move to bootstrap 4. this updates the menu, our language button has been made to fit the style, old one commented in code
-rw-r--r--common/footer.j2.inc6
-rw-r--r--common/navigation.j2.inc103
-rw-r--r--styles.css5
3 files changed, 57 insertions, 57 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 8a39e0af..ea22d3ae 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -2,20 +2,20 @@
2 <div class="container-fluid cushion-below"> 2 <div class="container-fluid cushion-below">
3 <div class="container"> 3 <div class="container">
4 <div class="row"> 4 <div class="row">
5 <div class="col-xs-12 col-sm-4"> 5 <div class="col-12 col-sm-4">
6 <ul class="footer-list"> 6 <ul class="footer-list">
7 <li><p><a href="about.html">{{ _("About") }}</a></p></li> 7 <li><p><a href="about.html">{{ _("About") }}</a></p></li>
8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li> 8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
9 <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li> 9 <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
10 </ul> 10 </ul>
11 </div> 11 </div>
12 <div class="col-xs-12 col-sm-4"> 12 <div class="col-12 col-sm-4">
13 <ul class="footer-list"> 13 <ul class="footer-list">
14 <li><p><a href="https://gnunet.org/bugs/">{{ _("Bug Tracker") }}</a></p></li> 14 <li><p><a href="https://gnunet.org/bugs/">{{ _("Bug Tracker") }}</a></p></li>
15 <li><p><a href="https://old.gnunet.org/bot/log/gnunet">{{ _("IRC logs") }}</a></p></li> 15 <li><p><a href="https://old.gnunet.org/bot/log/gnunet">{{ _("IRC logs") }}</a></p></li>
16 </ul> 16 </ul>
17 </div> 17 </div>
18 <div class="col-xs-12 col-sm-4"> 18 <div class="col-12 col-sm-4">
19 <ul class="footer-list"> 19 <ul class="footer-list">
20 <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li> 20 <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li>
21 <li><p><a href="https://gnunet.org/buildbot/">{{ _("Continuous Integration") }}</a></p></li> 21 <li><p><a href="https://gnunet.org/buildbot/">{{ _("Continuous Integration") }}</a></p></li>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 5a06dc73..e759b0a5 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -7,68 +7,63 @@
7 </ul> 7 </ul>
8</div> 8</div>
9--> 9-->
10<nav class="navbar navbar-inverse navbar-default"> 10<nav class="navbar navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark">
11 <div class="container-fluid"> 11 <a class="navbar-brand" href="index.html">
12 <ul class="nav navbar-nav"> 12 <!--
13 <li class="nav navbar-left"> 13 TODO: imo this is bad in the navbar. a readable "gnunet" font-logo would
14 <a class="navbar-brand mr-0 mr-md-2" href="index.html"> 14 be better for orientation.
15 <img src="../images/gnunet-icon.png" alt="" /> 15 -->
16 </a> 16 <img src="../images/gnunet-icon.png" alt="" />
17 </li> 17 </a>
18 <li class="dropdown"> 18 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation">
19 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Community") }} <span class="caret"></span></a> 19 <span class="navbar-toggler-icon"></span>
20 <ul class="dropdown-menu"> 20 </button>
21 <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li> 21 <div class="collapse navbar-collapse" id="navbarMain">
22 <li><a href="ev.html">{{ _("GNUnet e.V.") }}</a></li> 22 <ul class="navbar-nav mr-auto">
23 <li><a href="https://gnunet.org/bot/log/gnunet">{{ _("IRC Archive") }}</a></li> 23 <li class="nav-item dropdown">
24 <a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Community") }}</a>
25 <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
26 <li><a class="dropdown-item" href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
27 <li><a class="dropdown-item" href="ev.html">{{ _("GNUnet e.V.") }}</a></li>
28 <li><a class="dropdown-item" href="https://gnunet.org/bot/log/gnunet">{{ _("IRC Archive") }}</a></li>
24 </ul> 29 </ul>
25 </li> 30 </li>
26 <li class="dropdown"> 31 <li class="nav-item dropdown">
27 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Development") }} <span class="caret"></span></a> 32 <a class="nav-link" href="#" class="dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Development") }}</a>
28 <ul class="dropdown-menu"> 33 <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
29 <li><a href="architecture.html">{{ _("System Architecture") }}</a></li> 34 <li><a class="dropdown-item" href="architecture.html">{{ _("System Architecture") }}</a></li>
30 <li><a href="https://gnunet.org/bugs/my_view_page.php">{{ _("Bugtracker") }}</a></li> 35 <li><a class="dropdown-item" href="https://gnunet.org/bugs/my_view_page.php">{{ _("Bugtracker") }}</a></li>
31 <li><a href="https://gnunet.org/git">{{ _("Source Code") }}</a></li> 36 <li><a class="dropdown-item" href="https://gnunet.org/git">{{ _("Source Code") }}</a></li>
32 <li><a href="https://gnunet.org/buildbot/">{{ _("Continuous Integration") }}</a></li> 37 <li><a class="dropdown-item" href="https://gnunet.org/buildbot/">{{ _("Continuous Integration") }}</a></li>
33 <li><a href="gnurl.html">{{ _("libgnurl") }}</a></li> 38 <li><a class="dropdown-item" href="gnurl.html">{{ _("libgnurl") }}</a></li>
34 </ul> 39 </ul>
35 </li> 40 </li>
36 <li class="dropdown"> 41 <li class="nav-item dropdown">
37 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Documentation") }} <span class="caret"></span></a> 42 <a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Documentation") }}</a>
38 <ul class="dropdown-menu"> 43 <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
39 <li><a href="tutorial.html">{{ _("Tutorial") }}</a></li> 44 <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorial") }}</a></li>
40 <li><a href="glossary.html">{{ _("Glossary") }}</a></li> 45 <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li>
41 <li><a href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li> 46 <li><a class="dropdown-item" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li>
42 <li><a href="https://tutorial.gnunet.org/">{{ _("C-Tutorial") }}</a></li> 47 <li><a class="dropdown-item" href="https://tutorial.gnunet.org/">{{ _("C-Tutorial") }}</a></li>
43 <li><a href="faq.html">{{ _("FAQ") }}</a></li> 48 <li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
44 <li><a href="https://gnunet.org/bibliography">{{ _("Bibliography") }}</a></li> 49 <li><a class="dropdown-item" href="https://gnunet.org/bibliography">{{ _("Bibliography") }}</a></li>
45 </ul> 50 </ul>
46 </li> 51 </li>
47 </ul> 52 </ul>
48 <ul class="nav navbar-right"> 53 <ul class="navbar-nav navbar-right">
49 <li> 54 <li class="nav-item dropdown">
50 <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 55 <!--<button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
51 <img src="{{ url('images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] 56 <img src="{{ url('images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}]
52 <span class="caret"></span> 57 </button> -->
53 </button> 58 <a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ lang_full }} [{{ lang }}]</a>
54 <ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> 59 <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
55 <li> 60 <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li>
56 <a href="{{ self_localized('en') }}">English [en]</a> 61 <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li>
57 </li> 62 <li><a class="dropdown-item" href="{{ self_localized('fr') }}">Fran&ccedil;ais [fr]</a></li>
58 <li> 63 <li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
59 <a href="{{ self_localized('de') }}">Deutsch [de]</a> 64 <li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
60 </li>
61 <li>
62 <a href="{{ self_localized('fr') }}">Fran&ccedil;ais [fr]</a>
63 </li>
64 <li>
65 <a href="{{ self_localized('it') }}">Italiano [it]</a>
66 </li>
67 <li>
68 <a href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a>
69 </li>
70 </ul> 65 </ul>
71 </li> 66 </li>
72 </ul> 67 </ul>
73 </div> 68 </div>
74</nav> 69</nav>
diff --git a/styles.css b/styles.css
index 4534f9e6..cc11966b 100644
--- a/styles.css
+++ b/styles.css
@@ -54,6 +54,11 @@ main {
54 display:block; 54 display:block;
55} 55}
56*/ 56*/
57/* There's a fixed navbar that is 3.5rem tall */
58body {
59 padding-top: 3.5rem;
60}
61
57#body_content a:hover { 62#body_content a:hover {
58 transition: background-color 0.7s; 63 transition: background-color 0.7s;
59 background-color: #d00; 64 background-color: #d00;