diff options
author | ng0 <ng0@n0.is> | 2019-11-17 15:39:52 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-17 15:39:52 +0000 |
commit | f03141ac42d6c80084161cc5e595bc492e85b4f1 (patch) | |
tree | 9f7556b3f7f68913ebdd53d807d1feee1208274e /common | |
parent | 7b4bb87512d0296db97b6bee88ac03fcdd7a09e8 (diff) | |
download | www-f03141ac42d6c80084161cc5e595bc492e85b4f1.tar.gz www-f03141ac42d6c80084161cc5e595bc492e85b4f1.zip |
remove sticky attribute of navbar, add first rough "jump to top" button (needs improvement!)
Diffstat (limited to 'common')
-rw-r--r-- | common/base.j2 | 6 | ||||
-rw-r--r-- | common/footer.j2.inc | 5 | ||||
-rw-r--r-- | common/header.j2.inc | 5 | ||||
-rw-r--r-- | common/navigation.j2.inc | 2 | ||||
-rw-r--r-- | common/news.j2 | 3 |
5 files changed, 19 insertions, 2 deletions
diff --git a/common/base.j2 b/common/base.j2 index 70034222..f82e4f27 100644 --- a/common/base.j2 +++ b/common/base.j2 | |||
@@ -10,7 +10,11 @@ | |||
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" class="bg-near-white"> | 12 | <div id="body_content" class="bg-near-white"> |
13 | {% block body_content %}{% endblock %} | 13 | <!-- jump to top, TODO: the link does not cover all of the button --> |
14 | <a href="#" id="jump-top" role="button"> | ||
15 | <i class="fas fa-chevron-up"></i> | ||
16 | </a> | ||
17 | {% block body_content %}{% endblock %} | ||
14 | </div> | 18 | </div> |
15 | {% include "common/footer.j2.inc" %} | 19 | {% include "common/footer.j2.inc" %} |
16 | </body> | 20 | </body> |
diff --git a/common/footer.j2.inc b/common/footer.j2.inc index 6d4614b3..68a3b6de 100644 --- a/common/footer.j2.inc +++ b/common/footer.j2.inc | |||
@@ -31,5 +31,10 @@ | |||
31 | <a href="https://git.gnunet.org/www.git">{{ _("Source code of this site.") }}</a> | 31 | <a href="https://git.gnunet.org/www.git">{{ _("Source code of this site.") }}</a> |
32 | <a href="{{ url_localized('contact.html') }}">{{ _("Report issues with this website.") }}</a> | 32 | <a href="{{ url_localized('contact.html') }}">{{ _("Report issues with this website.") }}</a> |
33 | </p> | 33 | </p> |
34 | <noscript> | ||
35 | <p> | ||
36 | <a href="#">back to top</a> | ||
37 | </p> | ||
38 | </noscript> | ||
34 | </div> | 39 | </div> |
35 | </footer> | 40 | </footer> |
diff --git a/common/header.j2.inc b/common/header.j2.inc index 9301948c..2f809854 100644 --- a/common/header.j2.inc +++ b/common/header.j2.inc | |||
@@ -44,6 +44,11 @@ | |||
44 | <script src="{{ url_dist('js/bootstrap.min.js') }}"></script> | 44 | <script src="{{ url_dist('js/bootstrap.min.js') }}"></script> |
45 | <link href="{{ url_static('navbar.css') }}" rel="stylesheet"> | 45 | <link href="{{ url_static('navbar.css') }}" rel="stylesheet"> |
46 | 46 | ||
47 | <link href="{{ url_dist('font-awesome/css/all.css') }}" rel="stylesheet"> | ||
48 | |||
49 | <link href="{{ url_static('scroll.css') }}" rel="stylesheet"> | ||
50 | <script src="{{ url_static('scroll.js') }}"></script> | ||
51 | |||
47 | <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> | 52 | <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> |
48 | <!--[if lt IE 9]> | 53 | <!--[if lt IE 9]> |
49 | <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> | 54 | <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> |
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index a353fd13..dd7bb86d 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc | |||
@@ -15,7 +15,7 @@ | |||
15 | } | 15 | } |
16 | </style> | 16 | </style> |
17 | </noscript> | 17 | </noscript> |
18 | <nav class="navbar sticky-top navbar-expand-md bg-near-black"> | 18 | <nav class="navbar top navbar-expand-md bg-near-black"> |
19 | <a class="navbar-brand" href="{{ url_localized('index.html') }}"> | 19 | <a class="navbar-brand" href="{{ url_localized('index.html') }}"> |
20 | <img src="{{ url_static('images/gnunet-logo-dark-only-text.png') }}" alt="GNUnet" height="25px" /> | 20 | <img src="{{ url_static('images/gnunet-logo-dark-only-text.png') }}" alt="GNUnet" height="25px" /> |
21 | </a> | 21 | </a> |
diff --git a/common/news.j2 b/common/news.j2 index 9cdb06f2..71400760 100644 --- a/common/news.j2 +++ b/common/news.j2 | |||
@@ -10,6 +10,9 @@ | |||
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" class="bg-near-white"> | 12 | <div id="body_content" class="bg-near-white"> |
13 | <a href="#" id="jump-top" role="button"> | ||
14 | <i class="fas fa-chevron-up"></i> | ||
15 | </a> | ||
13 | <div class="container-fluid"> | 16 | <div class="container-fluid"> |
14 | <div class="container text-center"> | 17 | <div class="container text-center"> |
15 | <h1>News</h1> | 18 | <h1>News</h1> |