diff --git a/homepage/content/articles/0010-milestone-1.md b/homepage/content/articles/0010-milestone-1.md index e797b23..aba0197 100644 --- a/homepage/content/articles/0010-milestone-1.md +++ b/homepage/content/articles/0010-milestone-1.md @@ -5,6 +5,7 @@ slug: laying-foundation-for-fair-web-analytics sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0010-milestone1.jpg author: Hendrik Niefeld +bottom_cta: blog # Episode One — Laying the foundation for fair web analytics diff --git a/homepage/content/articles/0020-untold-roads.md b/homepage/content/articles/0020-untold-roads.md index dd14df5..c7c8264 100644 --- a/homepage/content/articles/0020-untold-roads.md +++ b/homepage/content/articles/0020-untold-roads.md @@ -5,6 +5,7 @@ slug: untold-roads-versioning-early-stage-software sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0020-untoldRoads.jpg author: Frederik Ring +bottom_cta: blog # Untold roads to v1.0 diff --git a/homepage/content/articles/0030-milestone-2.md b/homepage/content/articles/0030-milestone-2.md index 79b199f..8d514a4 100644 --- a/homepage/content/articles/0030-milestone-2.md +++ b/homepage/content/articles/0030-milestone-2.md @@ -5,6 +5,7 @@ slug: collecting-data-securely sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0030-milestone-2.jpg author: Hendrik Niefeld +bottom_cta: blog # Episode Two — Collecting data securely diff --git a/homepage/content/articles/0040-test-offen-today.md b/homepage/content/articles/0040-test-offen-today.md index eb26b92..aa64d09 100644 --- a/homepage/content/articles/0040-test-offen-today.md +++ b/homepage/content/articles/0040-test-offen-today.md @@ -5,6 +5,7 @@ slug: test-offen-today sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0040-test-offen-today.jpg author: Hendrik Niefeld +bottom_cta: blog # Test Offen today diff --git a/homepage/content/articles/0050-milestone-3.md b/homepage/content/articles/0050-milestone-3.md index 4381754..bc90fbe 100644 --- a/homepage/content/articles/0050-milestone-3.md +++ b/homepage/content/articles/0050-milestone-3.md @@ -5,6 +5,7 @@ slug: displaying-data sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0050-milestone-3.jpg author: Frederik Ring +bottom_cta: blog # Episode Three — Displaying data diff --git a/homepage/content/articles/0060-milestone-4.md b/homepage/content/articles/0060-milestone-4.md index 7763a3d..6295259 100644 --- a/homepage/content/articles/0060-milestone-4.md +++ b/homepage/content/articles/0060-milestone-4.md @@ -6,6 +6,7 @@ sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0060-milestone-4.jpg image_caption: Photo by WOCinTechChat / CC BY 3.0 author: Frederik Ring +bottom_cta: blog # Episode Four — Managing data diff --git a/homepage/content/articles/0070-budget.md b/homepage/content/articles/0070-budget.md index 9762213..8fe7405 100644 --- a/homepage/content/articles/0070-budget.md +++ b/homepage/content/articles/0070-budget.md @@ -5,6 +5,7 @@ slug: hosting-offen-on-budget sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0070-budget.jpg author: Frederik Ring +bottom_cta: blog # Hosting Offen on a budget diff --git a/homepage/content/articles/0080-beta.md b/homepage/content/articles/0080-beta.md index 6b40e14..6e4c408 100644 --- a/homepage/content/articles/0080-beta.md +++ b/homepage/content/articles/0080-beta.md @@ -5,6 +5,7 @@ slug: privacy-friendly-and-fair-web sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0080-beta.jpg author: Hendrik Niefeld +bottom_cta: blog # Let's build a web that is privacy friendly and fair diff --git a/homepage/content/articles/0090-milestone-5.md b/homepage/content/articles/0090-milestone-5.md index aae05a3..66c792c 100644 --- a/homepage/content/articles/0090-milestone-5.md +++ b/homepage/content/articles/0090-milestone-5.md @@ -5,6 +5,7 @@ slug: resilience-documentation sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0090-milestone-5.jpg author: Frederik Ring +bottom_cta: blog # Episode Five — Resilience and documentation diff --git a/homepage/content/pages/404.md b/homepage/content/pages/404.md index fc5d331..2fdf0cd 100644 --- a/homepage/content/pages/404.md +++ b/homepage/content/pages/404.md @@ -3,6 +3,7 @@ description: This link isn’t working. save_as: 404.html no_stats: true exclude_from_sitemap: true +bottom_cta: budget ![Page not Found](/theme/images/offen-404.png){:class="image-text-600-338"} diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md index 01f71ab..f52838c 100644 --- a/homepage/content/pages/about.md +++ b/homepage/content/pages/about.md @@ -1,10 +1,10 @@ title: About | Offen description: Who we are, who supports us and how you can can get in touch. slug: about +bottom_cta: fair ## About - ### Status Quo Offen is created by [Frederik Ring][frederik-ring]{: target="_blank"} and [Hendrik Niefeld][hendrik-niefeld]{: target="_blank"} and is currently being conceptually designed and in active development, both as a product as well as as a software. diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md index 625862e..6fbc1a0 100644 --- a/homepage/content/pages/deep-dive.md +++ b/homepage/content/pages/deep-dive.md @@ -2,6 +2,7 @@ title: Deep dive | Offen description: What do users know about their data? How can they access it? Do operators benefit from a careful handling of user data? Does Offen work in accordance with GDPR? slug: deep-dive sitemap_priority: 0.7 +bottom_cta: budget ## Deep dive diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md index 8728fb1..14aae6e 100644 --- a/homepage/content/pages/legal-notice.md +++ b/homepage/content/pages/legal-notice.md @@ -2,6 +2,7 @@ title: Legal Notice | Offen description: Information in accordance with Section 5 TMG slug: legal-notice exclude_from_sitemap: true +bottom_cta: fair ## Legal Notice diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py index 935bf4f..8b72a4e 100644 --- a/homepage/pelicanconf.py +++ b/homepage/pelicanconf.py @@ -95,6 +95,7 @@ MASTODON_URL = 'https://fosstodon.org/@offen' RELEASE_DIRECT_URL = 'https://get.offen.dev' DOCKER_DIRECT_URL = 'https://hub.docker.com/r/offen/offen' HEROKU_DIRECT_URL = 'https://heroku.com/deploy?template=https://github.com/offen/heroku/tree/master' +UBERSPACE_DIRECT_URL = 'https://lab.uberspace.de/guide_offen.html' OFFEN_AUDITORIUM_URL = 'https://offen.offen.dev/auditorium/' DOCS_GETSTARTED_URL = 'https://docs.offen.dev/running-offen/' DOCS_TRYDEMO_URL = 'https://docs.offen.dev/running-offen/test-drive/' diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index 1759176..e4b6306 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -54,8 +54,14 @@ COLORS .cclr-bg-white-fade-metrics { background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%), #F3F0E7; } - - +.cclr-bg-white-responsive { + background-color: #f9f7f2; +} +@media only screen and (min-width: 60rem) { + .cclr-bg-white-responsive { + background-color: #ffffff; + } +} /* --------------------------------------------------- LAYOUT ----------------------------------------------------*/ @@ -281,6 +287,19 @@ body { .f25 { font-size: 1.9rem; } +.f26 { + font-size: 1.9rem; +} +@media only screen and (min-width: 30em) { + .f26 { + font-size: 2.25rem; + } +} +@media only screen and (min-width: 60em) { + .f26 { + font-size: 1.9rem; + } +} span { display: table; } @@ -362,7 +381,7 @@ pre { code { border-radius: 3px; font-size: 85%; - padding: 0.2em 0.4em; + padding: 0.2em 0; color: #39352A; background-color: #EEEEEE; } @@ -399,6 +418,12 @@ IMAGES height: 190px; } } +@media only screen and (min-width: 60em) { + .larger-image { + margin-left: 0rem; + margin-right: 0rem; + } +} /* --------------------------------------------------- @@ -535,7 +560,7 @@ nav ul li { nav ul li a, nav ul li a:visited { display: block; - padding: 0 1.4rem; + padding: 0 1.2rem; line-height: 4rem; text-decoration: none; font-weight: 700; diff --git a/homepage/theme/templates/archives.html b/homepage/theme/templates/archives.html index 9f2ba19..d01fe96 100644 --- a/homepage/theme/templates/archives.html +++ b/homepage/theme/templates/archives.html @@ -5,30 +5,36 @@ {% set href = 'blog/' %} {% set no_stats = False %} {% set template = 'archives' %} -{% set cta_1 = True %} +{% set bottom_cta = 'index' %} {% block content %} - {% for article in articles %} - {% if loop.index != 1 %} -
- {% endif %} -
-
-
- - {{ article.title }} - -
-
- {{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }} -
-

- {{ article.title }} -

-

- {{ article.description }} Read more -

+
+
+ {% for article in articles %} +
+ {% if loop.index != 1 %} +
+ {% endif %} +
+
+
+ + {{ article.title }} + +
+
+ {{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }} +
+

+ {{ article.title }} +

+

+ {{ article.description }} Read more +

+
+
-
{% endfor %} + + {% endblock %} diff --git a/homepage/theme/templates/article.html b/homepage/theme/templates/article.html index 366516e..af98e3e 100644 --- a/homepage/theme/templates/article.html +++ b/homepage/theme/templates/article.html @@ -6,7 +6,7 @@ {% set image_url = article.image_url %} {% set no_stats = article.no_stats %} {% set template = article.template %} -{% set cta_1 = True %} +{% set bottom_cta = article.bottom_cta %} {% block content %}
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index cd4d559..dc56e16 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -102,45 +102,86 @@ {% else %} {% block outro %}
-
+
-
- {% if cta_1 %} -
-

- Participate + {% if bottom_cta == 'index' %} +
+
+

+ How do fair web analytics work?

-

- Audit our open source code and feel free to make a contribution. -

- Get involved + Open summary
- {% endif %} - - {% if cta_2 %} -
-

- In the making -

-

- Discover what is already up and running and where we want to go. -

- Open blog -
- {% endif %} - -
-

- Ethical internet -

-

- Help to ensure that Offen is independent and can be sustained. -

- Support us
+ {% endif %} + + {% if bottom_cta == 'blog' %} +
+
+

+ Continue reading? +

+ See all blog posts +
+
+ {% endif %} + + {% if bottom_cta == 'fair' %} +
+

+ Also on our blog +

+
+
+
+ + Let's build a web that is privacy friendly and fair + +
+
+
+
+

+ Let's build a web that is privacy friendly and fair +

+

+ What does the term 'privacy friendly' actually stand for? Mostly it's just about technical issues that don't tackle the underlying problem. Read more +

+
+
+
+
+ {% endif %} + + {% if bottom_cta == 'budget' %} +
+

+ Also on our blog +

+
+
+
+ + Hosting Offen on a budget + +
+
+
+
+

+ Hosting Offen on a budget +

+

+ Here are some real world options for hosting Offen on a budget. Let's compare how they relate in terms of ease of deployment, performance and pricing. Read more +

+
+
+
+
+ {% endif %} + -

diff --git a/homepage/theme/templates/getstarted.html b/homepage/theme/templates/getstarted.html index 1030e56..d76226c 100644 --- a/homepage/theme/templates/getstarted.html +++ b/homepage/theme/templates/getstarted.html @@ -19,7 +19,9 @@ Single binary file
for Linux, Windows or MacOS

Download - +
+
+

Offen as a lightweight
Docker image

@@ -28,7 +30,12 @@

Your own instance on Heroku

- Deploy to Heroku + Deploy to Heroku + +

+ Your own instance on Uberspace +

+ Deploy to Uberspace
diff --git a/homepage/theme/templates/page.html b/homepage/theme/templates/page.html index f366112..491273f 100644 --- a/homepage/theme/templates/page.html +++ b/homepage/theme/templates/page.html @@ -6,7 +6,7 @@ {% set image_url = page.image_url %} {% set no_stats = page.no_stats %} {% set template = page.template %} -{% set cta_2 = True %} +{% set bottom_cta = page.bottom_cta %} {% block content %}
diff --git a/homepage/theme/templates/trydemo.html b/homepage/theme/templates/trydemo.html index 6d3b6a5..1f6a88c 100644 --- a/homepage/theme/templates/trydemo.html +++ b/homepage/theme/templates/trydemo.html @@ -39,13 +39,20 @@

- Read the docs + Learn more

Details on how to
install and run Offen

- Open Docs + Open Docs +
+ +
+

+ All you need
to use Offen in production +

+ Get started