From c2fe667404861325e22ada6e36bb4672e8633064 Mon Sep 17 00:00:00 2001 From: hendr-ik Date: Thu, 2 Jan 2020 17:12:10 +0100 Subject: [PATCH 1/2] font display, overscroll color --- homepage/content/pages/about.md | 2 +- homepage/theme/static/css/fix.css | 2 - homepage/theme/static/css/fonts.css | 4 +- homepage/theme/templates/base.html | 232 ++++++++++++++-------------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md index 509985c..85f75ec 100644 --- a/homepage/content/pages/about.md +++ b/homepage/content/pages/about.md @@ -26,4 +26,4 @@ We are happy to work with [NLnet Foundation][nlnet-foundation]{: target="_blank" *Feel free to contact us with any kind of feedback.* From criticism and praise to contributions or support, everything is welcome. Get in touch. [hioffen@posteo.de](mailto:hioffen@posteo.de) -[Email GPG Key](/theme/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc){: target="_blank"} +[GPG Key](/theme/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc){: target="_blank"} diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index 67e4c61..d7ab73c 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -82,8 +82,6 @@ TYPO AND LAYOUT ELEMENTS body { overflow-wrap: break-word; overscroll-behavior: none; - /* overscroll color */ - background-color: #39352A; } /* Custom Tachyons class */ .f25 { diff --git a/homepage/theme/static/css/fonts.css b/homepage/theme/static/css/fonts.css index a6969e0..9016b65 100644 --- a/homepage/theme/static/css/fonts.css +++ b/homepage/theme/static/css/fonts.css @@ -1,7 +1,7 @@ /* rubik-regular - latin */ @font-face { font-family: 'Rubik'; - font-display: swap; + font-display: block; font-style: normal; font-weight: 400; src: local('Rubik'), local('Rubik-Regular'), @@ -12,7 +12,7 @@ /* rubik-700 - latin */ @font-face { font-family: 'Rubik'; - font-display: swap; + font-display: block; font-style: normal; font-weight: 700; src: local('Rubik Bold'), local('Rubik-Bold'), diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 076bf8b..c9184b0 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -32,130 +32,132 @@ {% endif %} {% endblock %} - -
-
-
-
- + +
+
+
+
+
+ +
+
- -
-
-
- {% block content %} -
-
- {{ content }} + +
+ {% block content %} +
+
+ {{ content }} +
-
- {% endblock %} + {% endblock %} - {% block outro %} -
-
-
-
-
-

- Participate -

-

- Development of Offen has just started. Do not hesitate to make a contribution and help us handle data with respect. -

- Get involved -
- {% if is_article != 'true' %} -
-

- In the making -

-

- Offen is still in alpha. Discover what is already up and running and where we want to go in the coming months. -

- Project status -
- {% endif %} -
-

- Ethical internet -

-

- We're working hard to ensure that Offen is independent and can be sustained for years to come. -

- Support us + {% block outro %} +
+
+
+
+
+

+ Participate +

+

+ Development of Offen has just started. Do not hesitate to make a contribution and help us handle data with respect. +

+ Get involved +
+ {% if is_article != 'true' %} +
+

+ In the making +

+

+ Offen is still in alpha. Discover what is already up and running and where we want to go in the coming months. +

+ Project status +
+ {% endif %} +
+

+ Ethical internet +

+

+ We're working hard to ensure that Offen is independent and can be sustained for years to come. +

+ Support us +
-
- {% endblock %} -
-
-
-

- Offen -

-

Transparent web analytics

-

for everyone

-
-
-

- {{CONTACT_EMAIL}} -

-

- GPG Key -

-

- GitHub -

-

- Patreon -

-
-
-

- LinkedIn -

-

- Twitter -

-

- Legal Notice -

-
-
- {{ BUILD_DATE }} + {% endblock %} +
+
+
+

+ Offen +

+

Transparent web analytics

+

for everyone

+
+
+

+ {{CONTACT_EMAIL}} +

+

+ GPG Key +

+

+ GitHub +

+

+ Patreon +

+
+
+

+ LinkedIn +

+

+ Twitter +

+

+ Legal Notice +

+
+
+ {{ BUILD_DATE }} +
-
- {% block scripts %} - {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} - - {% endassets %} - {% endblock %} + {% block scripts %} + {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} + + {% endassets %} + {% endblock %} +
From 1ccc103fe0be9e29b603263e38974f463f1a1284 Mon Sep 17 00:00:00 2001 From: hendr-ik Date: Thu, 2 Jan 2020 17:15:20 +0100 Subject: [PATCH 2/2] move block scripts --- homepage/theme/templates/base.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index c9184b0..69510a0 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -152,12 +152,11 @@
- - {% block scripts %} - {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} - - {% endassets %} - {% endblock %}
+ {% block scripts %} + {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} + + {% endassets %} + {% endblock %}