[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch master updated (abd6698 -> f03141a)
|
From: |
gnunet |
|
Subject: |
[www] branch master updated (abd6698 -> f03141a) |
|
Date: |
Sun, 17 Nov 2019 16:43:17 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a change to branch master
in repository www.
from abd6698 fix inc
new 7b4bb87 add back css, we never used much of the sass.
new f03141a remove sticky attribute of navbar, add first rough "jump to
top" button (needs improvement!)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 -
GNUmakefile | 10 +-
Makefile | 13 +-
common/base.j2 | 6 +-
common/footer.j2.inc | 5 +
common/header.j2.inc | 5 +
common/navigation.j2.inc | 2 +-
common/news.j2 | 3 +
static/scroll.css | 49 +++++++
static/scroll.js | 12 ++
static/styles.css | 310 +++++++++++++++++++++++++++++++++++++++++++
static/styles.sass | 334 -----------------------------------------------
12 files changed, 393 insertions(+), 358 deletions(-)
create mode 100644 static/scroll.css
create mode 100644 static/scroll.js
create mode 100644 static/styles.css
delete mode 100644 static/styles.sass
diff --git a/.gitignore b/.gitignore
index c2b3ea1..a5b4b5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,6 @@ ru/
__pycache__
*.pyc
-static/styles.css
-
sitemap.html
sitemap.xml
diff --git a/GNUmakefile b/GNUmakefile
index a8ffdc3..ffe9c28 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -19,7 +19,7 @@
include config.mk
-all: css locale template
+all: locale template
($(cp) rendered/static/robots.txt rendered/robots.txt)
($(cp) rendered/static/stage.robots.txt rendered/stage.robots.txt)
($(cp) rendered/static/robots.txt rendered/dist/robots.txt)
@@ -39,10 +39,6 @@ all: css locale template
(cd rendered/node ; $(ln) -fs about.html 397)
($(cp) static/moved_about.html rendered/about.html)
(cd rendered ; $(ln) -fs about.html philosophy)
-# (cd rendered; \
- for lang in en de es fr it; do \
- $(sh) ../rssg $$lang/news/index.html 'GNUnet.org' >
$$lang/news/rss.xml; \
- done)
(cd rendered; \
for lang in en de es fr it; do \
$(cp) $$lang/rss.xml $$lang/news/rss.xml; \
@@ -61,10 +57,6 @@ locale-update: locale/messages.pot
done)
if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo
-e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
-# sass preprocessor
-css:
- $(sassc) static/styles.sass static/styles.css
-
# Compile translation files for use.
locale-compile:
(for lang in en de fr it es; do \
diff --git a/Makefile b/Makefile
index 9c78465..cc73b41 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ DESTDIR=$(prefix)
_LOCALELIST= en de fr it es
_DIRLIST= dist static
-.PHONY: all run locale-compile locale install clean css
+.PHONY: all run locale-compile locale install clean
.OBJDIR=rendered
@@ -20,10 +20,7 @@ _DIRLIST= dist static
# All: build HTML pages in all languages and compile the
# TypeScript logic in web-common.
-all: css locale template
-#.for _dir in ${_DIRLIST}
-# $(cp) -R ${_dir} rendered/
-#.endfor
+all: locale template
.for _lang in ${_LOCALELIST}
($(cp) rendered/static/robots.txt rendered/${_lang})
($(cp) rendered/static/stage.robots.txt rendered/${_lang})
@@ -44,9 +41,6 @@ all: css locale template
(cd rendered/node ; $(ln) -fs about.html 397)
($(cp) static/moved_about.html rendered/about.html)
(cd rendered ; $(ln) -fs about.html philosophy)
-.for _lang in ${_LOCALELIST}
- (cd rendered; $(sh) ../rssg ${_lang}/news/index.html 'GNUnet News' >
${_lang}/news/rss.xml)
-.endfor
# Extract translateable strings from jinja2 templates.
locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
@@ -76,9 +70,6 @@ locale: locale-update locale-compile
template: locale-compile
$(python) ./make_site.py -vvvv
-css:
- $(sassc) static/styles.sass static/styles.css
-
run:
.if defined(browser) && !empty(DESTDIR) && !empty(python)
$(browser) http://0.0.0.0:8000/rendered/en/ &
diff --git a/common/base.j2 b/common/base.j2
index 7003422..f82e4f2 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -10,7 +10,11 @@
<body id="mybody">
{% include "common/navigation.j2.inc" %}
<div id="body_content" class="bg-near-white">
- {% block body_content %}{% endblock %}
+ <!-- jump to top, TODO: the link does not cover all of the button -->
+ <a href="#" id="jump-top" role="button">
+ <i class="fas fa-chevron-up"></i>
+ </a>
+ {% block body_content %}{% endblock %}
</div>
{% include "common/footer.j2.inc" %}
</body>
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 6d4614b..68a3b6d 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -31,5 +31,10 @@
<a href="https://git.gnunet.org/www.git";>{{ _("Source code of this
site.") }}</a>
<a href="{{ url_localized('contact.html') }}">{{ _("Report issues with
this website.") }}</a>
</p>
+ <noscript>
+ <p>
+ <a href="#">back to top</a>
+ </p>
+ </noscript>
</div>
</footer>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 9301948..2f80985 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -44,6 +44,11 @@
<script src="{{ url_dist('js/bootstrap.min.js') }}"></script>
<link href="{{ url_static('navbar.css') }}" rel="stylesheet">
+ <link href="{{ url_dist('font-awesome/css/all.css') }}" rel="stylesheet">
+
+ <link href="{{ url_static('scroll.css') }}" rel="stylesheet">
+ <script src="{{ url_static('scroll.js') }}"></script>
+
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media
queries -->
<!--[if lt IE 9]>
<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 a353fd1..dd7bb86 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -15,7 +15,7 @@
}
</style>
</noscript>
-<nav class="navbar sticky-top navbar-expand-md bg-near-black">
+<nav class="navbar top navbar-expand-md bg-near-black">
<a class="navbar-brand" href="{{ url_localized('index.html') }}">
<img src="{{ url_static('images/gnunet-logo-dark-only-text.png') }}"
alt="GNUnet" height="25px" />
</a>
diff --git a/common/news.j2 b/common/news.j2
index 9cdb06f..7140076 100644
--- a/common/news.j2
+++ b/common/news.j2
@@ -10,6 +10,9 @@
<body id="mybody">
{% include "common/navigation.j2.inc" %}
<div id="body_content" class="bg-near-white">
+ <a href="#" id="jump-top" role="button">
+ <i class="fas fa-chevron-up"></i>
+ </a>
<div class="container-fluid">
<div class="container text-center">
<h1>News</h1>
diff --git a/static/scroll.css b/static/scroll.css
new file mode 100644
index 0000000..b36c841
--- /dev/null
+++ b/static/scroll.css
@@ -0,0 +1,49 @@
+#jump-top {
+ position: fixed;
+ bottom: 20px;
+ right: 20px;
+ background: rgb(0, 0, 0);
+ background: rgba(0, 0, 0, 0.7);
+ width: 50px;
+ height: 50px;
+ display: block;
+ text-decoration: none;
+ -webkit-border-radius: 35px;
+ -moz-border-radius: 35px;
+ border-radius: 35px;
+ display: none;
+ -webkit-transition: all 0.3s linear;
+ -moz-transition: all 0.3s ease;
+ -ms-transition: all 0.3s ease;
+ -o-transition: all 0.3s ease;
+ transition: all 0.3s ease;
+}
+#jump-top i {
+ color: #fff;
+ margin: 0;
+ position: relative;
+ left: 16px;
+ top: 13px;
+ font-size: 19px;
+ -webkit-transition: all 0.3s ease;
+ -moz-transition: all 0.3s ease;
+ -ms-transition: all 0.3s ease;
+ -o-transition: all 0.3s ease;
+ transition: all 0.3s ease;
+}
+
+#jump-top:hover {
+ background: rgba(0, 0, 0, 0.9);
+}
+#jump-top:hover i {
+ color: #fff;
+ top: 5px;
+}
+/*
+.jump-top {
+ position: fixed;
+ bottom: 35px;
+ right: 35px;
+ display: none;
+}
+*/
diff --git a/static/scroll.js b/static/scroll.js
new file mode 100644
index 0000000..1180588
--- /dev/null
+++ b/static/scroll.js
@@ -0,0 +1,12 @@
+$(window).scroll(function() {
+ if ($(this).scrollTop() >= 50) {
+ $('#jump-top').fadeIn(200);
+ } else {
+ $('#jump-top').fadeOut(200);
+ }
+});
+$('#jump-top').click(function() {
+ $('html').animate({
+ scrollTop : 0
+ }, 500);
+});
diff --git a/static/styles.css b/static/styles.css
new file mode 100644
index 0000000..d2d9c88
--- /dev/null
+++ b/static/styles.css
@@ -0,0 +1,310 @@
+.static-top {
+ position: fixed;
+ top: 0;
+ right: 0;
+ left: 0;
+ z-index: 3; }
+
+.skip {
+ display: none !important;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ font-size: .857143em; }
+ .skip li {
+ position: absolute;
+ z-index: 1;
+ margin: 0; }
+ .skip a {
+ position: absolute;
+ left: -9999px; }
+ .skip a:active, .skip a:focus {
+ display: block;
+ position: static;
+ left: 0;
+ padding: .25em 1em; }
+
+.near-white {
+ color: #f4f4f4 !important; }
+
+.near-black {
+ color: #111; }
+
+.dark-grey {
+ color: #333; }
+
+.blue {
+ color: #357edd; }
+
+.bg-near-white {
+ background-color: #f4f4f4; }
+
+.bg-near-black {
+ background-color: #111; }
+
+code {
+ margin-bottom: 1em;
+ word-wrap: break-word; }
+
+a.btn {
+ text-decoration: none !important;
+ color: white !important; }
+ a.btn:link, a.btn:visited {
+ text-decoration: none !important;
+ color: white !important; }
+
+h6.description {
+ font-weight: bold;
+ letter-spacing: 2px;
+ color: #999;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+ padding-bottom: 5px; }
+
+.profile {
+ margin-top: 25px; }
+ .profile h1 {
+ font-weight: normal;
+ font-size: 20px;
+ margin: 10px 0 0 0; }
+ .profile h2 {
+ font-size: 14px;
+ font-weight: lighter;
+ margin-top: 5px; }
+ .profile .img-box {
+ opacity: 1;
+ display: block;
+ position: relative;
+ min-height: 160px; }
+ .profile .img-box:after {
+ content: "";
+ opacity: 0;
+ background-color: rgba(0, 0, 0, 0.75);
+ position: absolute;
+ right: 0;
+ left: 0;
+ top: 0;
+ bottom: 0; }
+ .profile .img-none {
+ text-align: center; }
+ .profile .img-none i.fa {
+ color: #eee;
+ font-size: 8em; }
+
+.img-box ul {
+ position: absolute;
+ z-index: 2;
+ bottom: 50px;
+ text-align: center;
+ width: 100%;
+ padding-left: 0px;
+ height: 0px;
+ margin: 0px;
+ opacity: 0; }
+
+.profile .img-box:after {
+ -webkit-transition: all 0.5s ease-in-out 0s;
+ -moz-transition: all 0.5s ease-in-out 0s;
+ transition: all 0.5s ease-in-out 0s; }
+
+.img-box ul {
+ -webkit-transition: all 0.5s ease-in-out 0s;
+ -moz-transition: all 0.5s ease-in-out 0s;
+ transition: all 0.5s ease-in-out 0s; }
+ .img-box ul li {
+ -webkit-transition: all 0.5s ease-in-out 0s;
+ -moz-transition: all 0.5s ease-in-out 0s;
+ transition: all 0.5s ease-in-out 0s; }
+ .img-box ul i {
+ font-size: 20px;
+ letter-spacing: 10px; }
+ .img-box ul li {
+ width: 30px;
+ height: 30px;
+ text-align: center;
+ color: #88C425;
+ margin: 2px;
+ padding: 5px;
+ display: inline-block; }
+
+.img-box a {
+ color: #fff; }
+
+.img-box:hover:after, .img-box:hover ul {
+ opacity: 1; }
+
+.img-box ul a {
+ -webkit-transition: all 0.3s ease-in-out 0s;
+ -moz-transition: all 0.3s ease-in-out 0s;
+ transition: all 0.3s ease-in-out 0s; }
+
+.img-box a:hover li {
+ border-color: #fff;
+ color: #88C425; }
+
+i.red {
+ color: #BC0213; }
+
+.btn-primary {
+ color: #fff;
+ background-color: #678;
+ border-color: #68a; }
+
+img.distro-logo {
+ height: 150px; }
+
+a.btn:hover {
+ transition: background-color 0.7s;
+ background-color: #217fae;
+ border-color: #fff;
+ color: white !important; }
+
+body .banner {
+ color: white;
+ padding-top: 20px;
+ padding-bottom: 20px; }
+
+#body_content .banner a {
+ color: white; }
+
+.lang-slector {
+ float: right;
+ padding-top: 2mm;
+ padding-bottom: 4mm;
+ margin-left: 15px;
+ margin-right: 15px; }
+
+html {
+ overflow-y: scroll; }
+
+.dark {
+ background-color: #333;
+ color: white; }
+
+.c_acronym {
+ background-color: #419edb;
+ color: white; }
+ .c_acronym a {
+ color: #c1d9f5; }
+
+footer a {
+ text-decoration: underline;
+ color: white; }
+ footer a:link, footer a:visited {
+ text-decoration: underline;
+ color: white; }
+ footer a:hover {
+ transition: background-color 0.3s;
+ background-color: rgba(100, 100, 100, 0.5); }
+
+.c_intro {
+ min-height: 97vh; }
+
+.in .nav-lang {
+ display: none; }
+
+.mobile-lang {
+ margin-left: 5px;
+ margin-top: 8px; }
+
+#mybody {
+ color: black; }
+
+.btn-dark {
+ background-color: #999; }
+
+#mybody nav {
+ border-radius: 0px;
+ padding: 10px; }
+
+.index-logo {
+ text-align: center; }
+
+footer {
+ padding: 2em; }
+
+#body_content {
+ min-height: 80vh; }
+ #body_content .container-wide {
+ margin-bottom: 2em;
+ padding-top: 1em;
+ padding-bottom: 1em;
+ padding-left: 2em;
+ padding-right: 2em; }
+ #body_content .container {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ padding-left: 2em;
+ padding-right: 2em;
+ max-width: 80em; }
+ #body_content .jumbotron {
+ margin-bottom: 0px; }
+
+.adorn_h3_bracket h3::before {
+ content: "#";
+ color: #333;
+ margin-right: 0.5em; }
+
+.footer-list {
+ list-style: none; }
+
+.cushion-above {
+ padding-top: 2em; }
+
+.cushion-below {
+ padding-bottom: 2em; }
+
+.invert {
+ -webkit-filter: invert(100%);
+ filter: invert(100%); }
+
+.row {
+ min-width: 50%; }
+
+header {
+ text-align: center;
+ margin-top: 30px;
+ margin-bottom: 50px; }
+
+.alert {
+ display: flex;
+ overflow: hidden;
+ background-color: #c4453c;
+ width: 100%;
+ align-items: center;
+ justify-content: center;
+ padding: 0.1em; }
+
+.alert-content {
+ color: #f6f6f6;
+ font: bold 16px/40px sans-serif;
+ text-align: center;
+ text-decoration: none; }
+
+.subnav a.nav-link:link, .subnav a.nav-link:visited {
+ color: #419edb !important; }
+
+a.subnav-anchor {
+ position: relative;
+ top: -80px; }
+
+.item-preview:link .item-previewvisited {
+ text-decoration: none;
+ color: #212529;
+ display: block;
+ padding: 10px 15px;
+ text-align: left; }
+
+.item-preview:active .item-preview:focus .item-preview:hover {
+ background-color: #F4BB15; }
+
+.item-preview h3 {
+ font-size: 1em;
+ font-weight: bold;
+ margin: 0px; }
+
+.item-preview p {
+ word-wrap: break-word; }
+
+.item-date {
+ font-size: 0.9em; }
diff --git a/static/styles.sass b/static/styles.sass
deleted file mode 100644
index d554d72..0000000
--- a/static/styles.sass
+++ /dev/null
@@ -1,334 +0,0 @@
-.static-top
- position: fixed
- top: 0
- right: 0
- left: 0
- z-index: 3
-
-.skip
- display: none !important
- position: absolute
- top: 0
- left: 0
- width: 100%
- font-size: .857143em
- li
- position: absolute
- z-index: 1
- margin: 0
- a
- position: absolute
- left: -9999px
- &:active, &:focus
- display: block
- position: static
- left: 0
- padding: .25em 1em
-
-// text colors
-
-// blunt-force priority, works for now.
-.near-white
- color: #f4f4f4 !important
-
-.near-black
- color: #111
-
-.dark-grey
- color: #333
-
-.blue
- color: #357edd
-
-// background colors
-
-.bg-near-white
- background-color: #f4f4f4
-
-.bg-near-black
- background-color: #111
-
-code
- margin-bottom: 1em
- word-wrap: break-word
-
-// hyperlinks and buttons
-
-//#body_content a
-// text-decoration: underline
-// color: #357edd
-// &:link, &:visited
-// text-decoration: underline
-// color: #357edd
-
-a.btn
- text-decoration: none !important
- color: white !important
- &:link, &:visited
- text-decoration: none !important
- color: white !important
-
-h6.description
- font-weight: bold
- letter-spacing: 2px
- color: #999
- border-bottom: 1px solid rgba(0, 0, 0, 0.1)
- padding-bottom: 5px
-
-.profile
- margin-top: 25px
- h1
- font-weight: normal
- font-size: 20px
- margin: 10px 0 0 0
- h2
- font-size: 14px
- font-weight: lighter
- margin-top: 5px
- .img-box
- opacity: 1
- display: block
- position: relative
- min-height: 160px
- &:after
- content: ""
- opacity: 0
- background-color: rgba(0, 0, 0, 0.75)
- position: absolute
- right: 0
- left: 0
- top: 0
- bottom: 0
- .img-none
- text-align: center
- i.fa
- color: #eee
- font-size: 8em
-
-.img-box ul
- position: absolute
- z-index: 2
- bottom: 50px
- text-align: center
- width: 100%
- padding-left: 0px
- height: 0px
- margin: 0px
- opacity: 0
-
-.profile .img-box:after
- -webkit-transition: all 0.5s ease-in-out 0s
- -moz-transition: all 0.5s ease-in-out 0s
- transition: all 0.5s ease-in-out 0s
-
-.img-box
- ul
- -webkit-transition: all 0.5s ease-in-out 0s
- -moz-transition: all 0.5s ease-in-out 0s
- transition: all 0.5s ease-in-out 0s
- li
- -webkit-transition: all 0.5s ease-in-out 0s
- -moz-transition: all 0.5s ease-in-out 0s
- transition: all 0.5s ease-in-out 0s
- i
- font-size: 20px
- letter-spacing: 10px
- li
- width: 30px
- height: 30px
- text-align: center
- color: #88C425
- margin: 2px
- padding: 5px
- display: inline-block
- a
- color: #fff
- &:hover
- &:after, ul
- opacity: 1
- ul a
- -webkit-transition: all 0.3s ease-in-out 0s
- -moz-transition: all 0.3s ease-in-out 0s
- transition: all 0.3s ease-in-out 0s
- a:hover li
- border-color: #fff
- color: #88C425
-
-i.red
- color: #BC0213
-
-.btn-primary
- color: #fff
- background-color: #678
- border-color: #68a
-
-img.distro-logo
- height: 150px
-
-a.btn:hover
- transition: background-color 0.7s
- background-color: #217fae
- border-color: #fff
- color: white !important
-
-body .banner
- color: white
- padding-top: 20px
- padding-bottom: 20px
-
-#body_content .banner a
- color: white
-
-.lang-slector
- float: right
- padding-top: 2mm
- padding-bottom: 4mm
- margin-left: 15px
- margin-right: 15px
-
-html
- overflow-y: scroll
-
-.dark
- background-color: #333
- color: white
-
-.c_acronym
- background-color: #419edb
- color: white
- a
- &:link &:visited
- color: #c1d9f5
-
-footer a
- text-decoration: underline
- color: white
- &:link, &:visited
- text-decoration: underline
- color: white
- &:hover
- transition: background-color 0.3s
- background-color: rgba(100, 100, 100, 0.5)
-
-.c_intro
- min-height: 97vh
-
-// don't show the language selector in the dropdown on mobile devices,
-// since it's in the top bar already.
-
-.in .nav-lang
- display: none
-
-.mobile-lang
- margin-left: 5px
- margin-top: 8px
-
-#mybody
- // override ugly bootstrap defaults
- color: black
-
-.btn-dark
- background-color: #999
-
-#mybody nav
- border-radius: 0px
- padding: 10px
-
-.index-logo
- text-align: center
-
-footer
- padding: 2em
-
-#body_content
- .container-wide
- margin-bottom: 2em
- padding-top: 1em
- padding-bottom: 1em
- padding-left: 2em
- padding-right: 2em
- .container
- padding-top: 1em
- padding-bottom: 1em
- padding-left: 2em
- padding-right: 2em
- max-width: 80em
- .jumbotron
- margin-bottom: 0px
- // push footer down
- min-height: 80vh
-
-.adorn_h3_bracket h3::before
- content: "#"
- color: #333
- margin-right: 0.5em
-
-.footer-list
- list-style: none
-
-.cushion-above
- padding-top: 2em
-
-.cushion-below
- padding-bottom: 2em
-
-.invert
- -webkit-filter: invert(100%)
- filter: invert(100%)
-
-.row
- min-width: 50%
-
-header
- text-align: center
- margin-top: 30px
- margin-bottom: 50px
-
-// Notification bar at top of index page
-.alert
- display: flex;
- overflow: hidden;
- background-color: #c4453c;
- width: 100%;
- align-items: center;
- justify-content: center;
- padding: 0.1em
-
-.alert-content
- //position: absolute;
- color: #f6f6f6;
- font: bold 16px/40px sans-serif;
- text-align: center;
- text-decoration: none;
-
-
-// Some docs are too long, thus there is a need for a subnav.
-// Use "subnav" class for the submenu.
-// Use "subnav-anchor" class for the a-tags right before a section title.
-.subnav
- a.nav-link
- &:link, &:visited
- color: #419edb !important
-a.subnav-anchor
- position: relative
- top: -80px
-
-.item-preview
- &:link &visited
- text-decoration: none
- color: #212529
- display: block
- padding: 10px 15px
- text-align: left
- &:active &:focus &:hover
- background-color: #F4BB15
- h3
- font-size: 1em
- font-weight: bold
- margin: 0px
-
- p
- word-wrap: break-word
-
-.item-date
- font-size: 0.9em
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [www] branch master updated (abd6698 -> f03141a),
gnunet <=