aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2019-06-27 16:05:57 +0200
committerxrs <xrs@mail36.net>2019-06-27 16:05:57 +0200
commitd1557afc3ea991ccde7f12b3ccfb3564012509ca (patch)
tree33550a307db86ca295463a7634e3dfdb19fcaeab
parent7716c26fe62a030f425eccf0f62956d0ce867157 (diff)
parentd9d8750749a6e606e2a5299a16d345f91a419355 (diff)
downloadwww-d1557afc3ea991ccde7f12b3ccfb3564012509ca.tar.gz
www-d1557afc3ea991ccde7f12b3ccfb3564012509ca.zip
Merge branch 'master' of ssh://git.gnunet.org/www
-rw-r--r--.gitignore2
-rw-r--r--Makefile7
-rw-r--r--README13
-rw-r--r--common/base.j22
-rw-r--r--common/footer.j2.inc17
-rw-r--r--common/navigation.j2.inc8
-rw-r--r--static/styles.css329
-rw-r--r--static/styles.sass280
-rw-r--r--template/ev.html.j22
-rw-r--r--template/gnurl.html.j22
-rw-r--r--template/index.html.j256
-rw-r--r--template/video.html.j24
12 files changed, 340 insertions, 382 deletions
diff --git a/.gitignore b/.gitignore
index 18e60000..7b902d00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@ ru/
19__pycache__ 19__pycache__
20*.pyc 20*.pyc
21 21
22static/styles.css
23
22sitemap.html 24sitemap.html
23 25
24*~ 26*~
diff --git a/Makefile b/Makefile
index 8dcb8526..5424e812 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,7 @@
11 11
12include config.mk 12include config.mk
13 13
14all: locale template 14all: css locale template
15 # Consider using pax instead of cp.
16 cp -R dist rendered/ 15 cp -R dist rendered/
17 cp -R static rendered/ 16 cp -R static rendered/
18 cp rendered/static/robots.txt rendered/robots.txt 17 cp rendered/static/robots.txt rendered/robots.txt
@@ -49,6 +48,10 @@ locale-update: locale/messages.pot
49 48
50 if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi 49 if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
51 50
51# sass preprocessor
52css:
53 sassc static/styles.sass static/styles.css
54
52# Compile translation files for use. 55# Compile translation files for use.
53locale-compile: 56locale-compile:
54 $(BABEL) -v compile -d locale -l en --use-fuzzy 57 $(BABEL) -v compile -d locale -l en --use-fuzzy
diff --git a/README b/README
index ecb60941..93bbd086 100644
--- a/README
+++ b/README
@@ -4,9 +4,15 @@ GNUnet Website
4 4
5Sourcecode for https://gnunet.org created from the https://taler.net code base. 5Sourcecode for https://gnunet.org created from the https://taler.net code base.
6 6
7Requires python3-jinja2, python3-babel, and gettext. 7Requirements
8------------
9- python3 modules:
10 - python3-jinja2, python3-babel
11- python3 interpreter:
12 - python 3.7 (although any 3.x version should work)
13- gettext
14- sassc, to compile the stylesheets
8 15
9The currently supported python3 version is python 3.7.
10 16
11Run "make" to build the HTML. 17Run "make" to build the HTML.
12If you experience a failure related to a python module, run 18If you experience a failure related to a python module, run
@@ -14,6 +20,9 @@ If you experience a failure related to a python module, run
14 20
15Expect it to show up in rendered/en/ and other language folders. 21Expect it to show up in rendered/en/ and other language folders.
16 22
23Run the following to start a python webserver:
24BROWSER=firefox make run
25
17Layout / how this comes to be 26Layout / how this comes to be
18============================= 27=============================
19 28
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 ff161335..416cc7c2 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"
diff --git a/static/styles.css b/static/styles.css
deleted file mode 100644
index 5a173c22..00000000
--- a/static/styles.css
+++ /dev/null
@@ -1,329 +0,0 @@
1.static-top {
2 position: fixed;
3 top: 0;
4 right: 0;
5 left: 0;
6 z-index: 3;
7}
8
9.skip {
10 display:none!important;
11}
12
13.skip {
14 position: absolute;
15 top: 0;
16 left: 0;
17 width: 100%;
18 font-size: .857143em;
19}
20
21.skip li {
22 position:absolute;
23 z-index:1;
24 margin:0;
25}
26.skip a {
27 position:absolute;
28 left:-9999px;
29}
30.skip a:active,
31.skip a:focus {
32 display:block;
33 position:static;
34 left:0;
35 padding:.25em 1em;
36}
37
38code {
39 margin-bottom: 1em;
40}
41
42/* hyperlinks and buttons */
43#body_content a,
44#body_content a:link,
45#body_content a:visited {
46 text-decoration: underline;
47 color: black;
48}
49a.btn,
50a.btn:link,
51a.btn:visited {
52 text-decoration: none !important;
53 color: white !important;
54}
55/* For reference if bootstrap does not cover the main-Element issue in IE9-11 */
56/*
57main {
58 display:block;
59}
60*/
61/* There's a fixed navbar that is 3.5rem tall */
62body {
63 padding-top: 3.5rem;
64 background-color: #baddef;
65}
66
67/*
68 Hover effects with this color don't work out!
69 See https://gnunet.org/bugs/view.php?id=5570
70*/
71/*
72#body_content a:hover {
73 transition: background-color 0.7s;
74 background-color: #d00;
75 border-color: #fff;
76 color: white !important;
77}
78*/
79.team {
80 padding: 75px 0;
81}
82h6.description {
83 font-weight: bold;
84 letter-spacing: 2px;
85 color: #999;
86 border-bottom: 1px solid rgba(0, 0, 0, 0.1);
87 padding-bottom: 5px;
88}
89.profile {
90 margin-top: 25px;
91}
92.profile h1{
93 font-weight: normal;
94 font-size: 20px;
95 margin: 10px 0 0 0;
96}
97.profile h2{
98 font-size: 14px;
99 font-weight: lighter;
100 margin-top: 5px;
101}
102.profile .img-box {
103 opacity: 1;
104 display: block;
105 position: relative;
106 min-height: 160px;
107}
108.profile .img-box:after{
109 content:"";
110 opacity: 0;
111 background-color: rgba(0, 0, 0, 0.75);
112 position: absolute;
113 right: 0;
114 left: 0;
115 top: 0;
116 bottom: 0;
117}
118
119.profile .img-none {
120 text-align: center;
121}
122
123.profile .img-none i.fa {
124 color: #eee;
125 font-size: 8em;
126}
127
128.img-box ul{
129 position: absolute;
130 z-index: 2;
131 bottom: 50px;
132 text-align: center;
133 width: 100%;
134 padding-left: 0px;
135 height: 0px;
136 margin: 0px;
137 opacity: 0;
138}
139.profile .img-box:after, .img-box ul, .img-box ul li {
140 -webkit-transition: all 0.5s ease-in-out 0s;
141 -moz-transition: all 0.5s ease-in-out 0s;
142 transition: all 0.5s ease-in-out 0s;
143}
144.img-box ul i{
145 font-size: 20px;
146 letter-spacing: 10px;
147}
148.img-box ul li{
149 width: 30px;
150 height: 30px;
151 text-align: center;
152 /*border: 1px solid #88C425;*/
153 color: #88C425;
154 margin: 2px;
155 padding: 5px;
156 display: inline-block;
157}
158.img-box a {
159 color: #fff;
160}
161.img-box:hover:after{
162 opacity: 1;
163}
164.img-box:hover ul{
165 opacity: 1;
166}
167.img-box ul a {
168 -webkit-transition: all 0.3s ease-in-out 0s;
169 -moz-transition: all 0.3s ease-in-out 0s;
170 transition: all 0.3s ease-in-out 0s;
171}
172.img-box a:hover li{
173 border-color: #fff;
174 color: #88C425;
175}
176i.red {
177 color: #BC0213;
178}
179.btn-primary {
180 color: #fff;
181 background-color: #678;
182 border-color: #68a;
183}
184a.btn:hover {
185 transition: background-color 0.7s;
186 background-color: #419edb;
187 border-color: #fff;
188 color: white !important;
189}
190
191
192body .banner {
193 color: white;
194 padding-top: 20px;
195 padding-bottom: 20px;
196}
197#body_content .banner a {
198 color: white;
199}
200
201
202.lang-slector {
203 float: right;
204 padding-top: 2mm;
205 padding-bottom: 4mm;
206 margin-left: 15px;
207 margin-right: 15px;
208}
209
210html {
211 overflow-y: scroll;
212}
213
214.dark {
215 background-color: #cccccc;
216}
217
218.c_acronym {
219 background-color: #217fae;
220 color: white;
221}
222
223footer a,
224footer a:link,
225footer a:visited {
226 text-decoration: underline;
227 color: white;
228}
229
230footer a:hover {
231 transition: background-color 0.3s;
232 background-color: rgba(100, 100, 100, 0.5);
233}
234
235.c_intro {
236 min-height: 97vh;
237}
238
239/* don't show the language selector in the dropdown on mobile devices,
240 * since it's in the top bar already.
241 */
242.in .nav-lang {
243 display: none;
244}
245
246.mobile-lang {
247 margin-left:5px;
248 margin-top: 8px;
249}
250
251#mybody {
252 /* override ugly bootstrap defaults */
253 color: black;
254}
255
256.btn-dark {
257 background-color: #999;
258}
259
260
261#mybody nav {
262 border-radius: 0px;
263 padding: 10px;
264}
265.index-logo {
266 text-align: center;
267}
268
269footer {
270 padding-top: 2em;
271 margin-top: 2em;
272 background-color: #333;
273 color: white;
274}
275
276#body_content .container-wide {
277 margin-bottom: 2em;
278 padding-top: 1em;
279 padding-bottom: 1em;
280 padding-left: 2em;
281 padding-right: 2em;
282}
283#body_content .container {
284 margin-bottom: 2em;
285 padding-top: 1em;
286 padding-bottom: 1em;
287 padding-left: 2em;
288 padding-right: 2em;
289 max-width: 80em;
290}
291
292#body_content {
293 /* push footer down */
294 min-height: 80vh;
295 /* space for the nav */
296 padding-top: 70px;
297}
298#body_content .jumbotron {
299 /* background-color: #cccccc;*/
300 background-image: radial-gradient(circle, #baddef, #baddef, #349fd7);
301 margin-bottom: 0px;
302}
303
304.adorn_h3_bracket h3::before {
305 content: "⊛";
306 color: #333;
307 margin-right: 0.5em;
308}
309
310.footer-list {
311 list-style: none;
312}
313
314.cushion-above {
315 padding-top: 2em;
316}
317
318.cushion-below {
319 padding-bottom: 2em;
320}
321
322.invert {
323 -webkit-filter: invert(100%);
324 filter: invert(100%);
325}
326
327.row {
328 min-widht: 50%;
329}
diff --git a/static/styles.sass b/static/styles.sass
new file mode 100644
index 00000000..285a9bc2
--- /dev/null
+++ b/static/styles.sass
@@ -0,0 +1,280 @@
1.static-top
2 position: fixed
3 top: 0
4 right: 0
5 left: 0
6 z-index: 3
7
8.skip
9 display: none !important
10 position: absolute
11 top: 0
12 left: 0
13 width: 100%
14 font-size: .857143em
15 li
16 position: absolute
17 z-index: 1
18 margin: 0
19 a
20 position: absolute
21 left: -9999px
22 &:active, &:focus
23 display: block
24 position: static
25 left: 0
26 padding: .25em 1em
27
28// text colors
29
30.near-white
31 color: #f4f4f4
32
33.near-black
34 color: #111
35
36.dark-grey
37 color: #333
38
39.blue
40 color: #357edd
41
42// background colors
43
44.bg-near-white
45 background-color: #f4f4f4
46
47.bg-near-black
48 background-color: #111
49
50code
51 margin-bottom: 1em
52
53// hyperlinks and buttons
54
55#body_content a
56 text-decoration: underline
57 color: #357edd
58 &:link, &:visited
59 text-decoration: underline
60 color: #357edd
61
62a.btn
63 text-decoration: none !important
64 color: white !important
65 &:link, &:visited
66 text-decoration: none !important
67 color: white !important
68
69.team
70 padding: 75px 0
71
72h6.description
73 font-weight: bold
74 letter-spacing: 2px
75 color: #999
76 border-bottom: 1px solid rgba(0, 0, 0, 0.1)
77 padding-bottom: 5px
78
79.profile
80 margin-top: 25px
81 h1
82 font-weight: normal
83 font-size: 20px
84 margin: 10px 0 0 0
85 h2
86 font-size: 14px
87 font-weight: lighter
88 margin-top: 5px
89 .img-box
90 opacity: 1
91 display: block
92 position: relative
93 min-height: 160px
94 &:after
95 content: ""
96 opacity: 0
97 background-color: rgba(0, 0, 0, 0.75)
98 position: absolute
99 right: 0
100 left: 0
101 top: 0
102 bottom: 0
103 .img-none
104 text-align: center
105 i.fa
106 color: #eee
107 font-size: 8em
108
109.img-box ul
110 position: absolute
111 z-index: 2
112 bottom: 50px
113 text-align: center
114 width: 100%
115 padding-left: 0px
116 height: 0px
117 margin: 0px
118 opacity: 0
119
120.profile .img-box:after
121 -webkit-transition: all 0.5s ease-in-out 0s
122 -moz-transition: all 0.5s ease-in-out 0s
123 transition: all 0.5s ease-in-out 0s
124
125.img-box
126 ul
127 -webkit-transition: all 0.5s ease-in-out 0s
128 -moz-transition: all 0.5s ease-in-out 0s
129 transition: all 0.5s ease-in-out 0s
130 li
131 -webkit-transition: all 0.5s ease-in-out 0s
132 -moz-transition: all 0.5s ease-in-out 0s
133 transition: all 0.5s ease-in-out 0s
134 i
135 font-size: 20px
136 letter-spacing: 10px
137 li
138 width: 30px
139 height: 30px
140 text-align: center
141 color: #88C425
142 margin: 2px
143 padding: 5px
144 display: inline-block
145 a
146 color: #fff
147 &:hover
148 &:after, ul
149 opacity: 1
150 ul a
151 -webkit-transition: all 0.3s ease-in-out 0s
152 -moz-transition: all 0.3s ease-in-out 0s
153 transition: all 0.3s ease-in-out 0s
154 a:hover li
155 border-color: #fff
156 color: #88C425
157
158i.red
159 color: #BC0213
160
161.btn-primary
162 color: #fff
163 background-color: #678
164 border-color: #68a
165
166a.btn:hover
167 transition: background-color 0.7s
168 background-color: #d00
169 border-color: #fff
170 color: white !important
171
172body .banner
173 color: white
174 padding-top: 20px
175 padding-bottom: 20px
176
177#body_content .banner a
178 color: white
179
180.lang-slector
181 float: right
182 padding-top: 2mm
183 padding-bottom: 4mm
184 margin-left: 15px
185 margin-right: 15px
186
187html
188 overflow-y: scroll
189
190.dark
191 background-color: #333
192 color: white
193
194.c_acronym
195 background-color: #217fae
196 color: white
197
198footer a
199 text-decoration: underline
200 color: white
201 &:link, &:visited
202 text-decoration: underline
203 color: white
204 &:hover
205 transition: background-color 0.3s
206 background-color: rgba(100, 100, 100, 0.5)
207
208.c_intro
209 min-height: 97vh
210
211// don't show the language selector in the dropdown on mobile devices,
212// since it's in the top bar already.
213
214.in .nav-lang
215 display: none
216
217.mobile-lang
218 margin-left: 5px
219 margin-top: 8px
220
221#mybody
222 // override ugly bootstrap defaults
223 color: black
224
225.btn-dark
226 background-color: #999
227
228#mybody nav
229 border-radius: 0px
230 padding: 10px
231
232.index-logo
233 text-align: center
234
235footer
236 padding-top: 2em
237 margin-top: 2em
238
239#body_content
240 .container-wide
241 margin-bottom: 2em
242 padding-top: 1em
243 padding-bottom: 1em
244 padding-left: 2em
245 padding-right: 2em
246 .container
247 padding-top: 1em
248 padding-bottom: 1em
249 padding-left: 2em
250 padding-right: 2em
251 max-width: 80em
252 .jumbotron
253 margin-bottom: 0px
254 // background-color: #cccccc;
255 // background-image: radial-gradient(circle, #baddef, #baddef, #349fd7);
256 // push footer down
257 min-height: 80vh
258 // space for the nav
259 // padding-top: 70px;
260
261.adorn_h3_bracket h3::before
262 content: "#"
263 color: #333
264 margin-right: 0.5em
265
266.footer-list
267 list-style: none
268
269.cushion-above
270 padding-top: 2em
271
272.cushion-below
273 padding-bottom: 2em
274
275.invert
276 -webkit-filter: invert(100%)
277 filter: invert(100%)
278
279.row
280 min-width: 50%
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index e4fb802c..31c580d9 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -26,7 +26,7 @@
26 </div> 26 </div>
27</div> 27</div>
28 28
29<div class="container adorn_h3_bracket"> 29<div class="container">
30 <div class="row"> 30 <div class="row">
31 <div class="col-lg-6"> 31 <div class="col-lg-6">
32 <h3>{{ _("Governance") }}</h3> 32 <h3>{{ _("Governance") }}</h3>
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index 006b8623..8834e967 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -118,7 +118,7 @@
118 </article> 118 </article>
119</div> 119</div>
120 120
121<div class="container adorn_h3_bracket"> 121<div class="container">
122 <div class="row"> 122 <div class="row">
123 <div class="col-lg-6"> 123 <div class="col-lg-6">
124 <h3>{{ _("Source Code") }}</h3> 124 <h3>{{ _("Source Code") }}</h3>
diff --git a/template/index.html.j2 b/template/index.html.j2
index ead20179..977aea5c 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -1,7 +1,7 @@
1{% extends "common/base.j2" %} 1{% extends "common/base.j2" %}
2{% block body_content %} 2{% block body_content %}
3<!-- Jumbotron --> 3<!-- Jumbotron -->
4<div class="jumbotron"> 4<div class="jumbotron bg-near-black near-white">
5 <div class="container"> 5 <div class="container">
6 <div class="row"> 6 <div class="row">
7 <div class="col-lg-6"> 7 <div class="col-lg-6">
@@ -61,13 +61,13 @@
61 </div> 61 </div>
62</div> 62</div>
63 63
64<!--<article>-->
65 64
66<div class="container-fluid adorn_h3_bracket c_acronym"> 65
66<div class="container-fluid c_acronym">
67 <div class="container"> 67 <div class="container">
68 <div class="row"> 68 <div class="row">
69 <div class="container text-center"> 69 <div class="container text-center">
70 <h2>{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</h2> 70 <h1>{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</h1>
71 </div> 71 </div>
72 </div> 72 </div>
73 <div class="row"> 73 <div class="row">
@@ -148,7 +148,8 @@
148 which <a 148 which <a
149 href="https://www.freehaven.net/anonbib/cache/websitefingerprinting-pets2016.pdf">enables 149 href="https://www.freehaven.net/anonbib/cache/websitefingerprinting-pets2016.pdf">enables
150 reverse-engineering pages visited via website 150 reverse-engineering pages visited via website
151 fingerprinting</a>. --> 151 fingerprinting</a>.
152 -->
152 {% endtrans %} 153 {% endtrans %}
153 <p> 154 <p>
154 {% trans %} 155 {% trans %}
@@ -187,35 +188,23 @@
187 </div> 188 </div>
188 </div> 189 </div>
189 </div> 190 </div>
190 <!-- 191</div>
192
193
194
195<div class="container-fluid">
191 <div class="container"> 196 <div class="container">
192 <div class="row"> 197 <div class="row">
193 <div class="container text-center bg-primary"> 198 <div class="container text-center">
194 <h3> 199 <h1>
195 {% trans %} 200 {% trans %}
196 GNUnet aims to enable a secure and ethical Internet. 201 Featured Applications
197 {% endtrans %} 202 {% endtrans %}
198 </h3> 203 </h1>
199 </div> 204 </div>
200 </div> 205 </div>
201 </div> 206 <div class="row">
202 //--> 207 <div class="col-lg-4">
203</div>
204
205
206
207<div class="container adorn_h3_bracket">
208 <div class="row">
209 <div class="container text-center">
210 <h2>
211 {% trans %}
212 Featured Applications
213 {% endtrans %}
214 </h2>
215 </div>
216 </div>
217 <div class="row">
218 <div class="col-lg-4">
219 <section> 208 <section>
220 <h3>{{ _("GNU Taler") }}</h3> 209 <h3>{{ _("GNU Taler") }}</h3>
221 <p> 210 <p>
@@ -287,17 +276,18 @@
287 </section> 276 </section>
288 </div> 277 </div>
289 </div> 278 </div>
279 </div>
290</div> 280</div>
291 281
292<div class="container-fluid adorn_h3_bracket c_acronym"> 282<div class="container-fluid c_acronym">
293 <div class="container"> 283 <div class="container">
294 <div class="row"> 284 <div class="row">
295 <div class="container text-center"> 285 <div class="container text-center">
296 <h2> 286 <h1>
297 {% trans %} 287 {% trans %}
298 Upcoming Applications 288 Upcoming Applications
299 {% endtrans %} 289 {% endtrans %}
300 </h2> 290 </h1>
301 </div> 291 </div>
302 </div> 292 </div>
303 <div class="row"> 293 <div class="row">
@@ -333,9 +323,9 @@
333 </div> 323 </div>
334</div> 324</div>
335 325
336<!--</article>-->
337 326
338<div class="container adorn_h3_bracket"> 327
328<div class="container">
339 <div class="row"> 329 <div class="row">
340 <div class="container text-center"> 330 <div class="container text-center">
341 <h2>{{ _("News") }}</h2> 331 <h2>{{ _("News") }}</h2>
diff --git a/template/video.html.j2 b/template/video.html.j2
index 8198d3d4..fbfa1b6f 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -1,7 +1,7 @@
1{% extends "common/base.j2" %} 1{% extends "common/base.j2" %}
2{% block body_content %} 2{% block body_content %}
3<div class="container adorn_h3_bracket"> 3<div class="container">
4<div class="container adorn_h3_bracket"> 4<div class="container">
5 <div class="container"> 5 <div class="container">
6 <div class="text-center"> 6 <div class="text-center">
7 <header> 7 <header>