diff --git a/build/Dockerfile b/build/Dockerfile index c82a961..9d509ac 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -8,6 +8,7 @@ ENV SITEURL=$siteurl ARG offenaccountid ENV OFFEN_ACCOUNT_ID=$offenaccountid +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 svgo@^1.3.0 RUN apt-get update \ && apt-get install -y libjpeg-progs optipng \ diff --git a/homepage/content/articles/0030-milestone-2.md b/homepage/content/articles/0030-milestone-2.md index da7ad03..c465771 100644 --- a/homepage/content/articles/0030-milestone-2.md +++ b/homepage/content/articles/0030-milestone-2.md @@ -33,10 +33,10 @@ The current state of *Offen runs on this domain.* You should have noticed our co ### Testdrive on your system Whether you are a developer that want to contribute or a website operator that wants to test Offen. Have a demo up and running in no time on your local machine. Download and install a single binary file on Linux, Windows or MacOS. -[Download demo](https://github.com/offen/offen/releases/download/v0.1.0-alpha.1/offen-v0.1.0-alpha.1.tar.gz){: target="_blank" data-button="yellow"} +[Download demo](https://github.com/offen/offen/releases/download/v0.1.0-alpha.2/offen-v0.1.0-alpha.2.tar.gz){: data-button="yellow"} ### Feeling adventurous? -Offen is under active development but with the introduction of the user consent banner has become usable for the general public. If you are brave enough you can use our [very first alpha release](https://github.com/offen/offen/releases/tag/v0.1.0-alpha.1){: target="_blank"} in a production environment. +Offen is under active development but with the introduction of the user consent banner has become usable for the general public. If you are brave enough you can use our [latest alpha release](https://github.com/offen/offen/releases/latest/){: target="_blank"} in a production environment. ### We need to talk about Safari Currently, the way we store encryption keys securely on the client side does not work in Apple's Safari browser. Fortunately, our improved opt-in flow will allow us to resume Safari support in milestone 3. Please bear with us until then. diff --git a/homepage/content/pages/get-started.md b/homepage/content/pages/get-started.md new file mode 100644 index 0000000..e1d6f65 --- /dev/null +++ b/homepage/content/pages/get-started.md @@ -0,0 +1,5 @@ +title: Get started | Offen +description: Want to collect usage statistics transparently? Like to contribute as a developer? Download our latest release and learn how to run, use and develop Open. +slug: get-started +template: getstarted +sitemap_priority: 0.8 diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py index d6d053f..3afd213 100644 --- a/homepage/pelicanconf.py +++ b/homepage/pelicanconf.py @@ -70,5 +70,7 @@ GPG_KEY_FILE = '74B041E23DB29D552644CEB1B18C633D6967FE3F.asc' PATREON_URL = 'https://www.patreon.com/offen' LINKEDIN_URL = 'https://www.linkedin.com/company/hioffen' TWITTER_URL = 'https://twitter.com/hioffen' +RELEASE_URL = 'https://github.com/offen/offen/releases/latest/' +RELEASE_DIRECT_URL = 'https://github.com/offen/offen/releases/download/v0.1.0-alpha.2/offen-v0.1.0-alpha.2.tar.gz' OFFEN_ACCOUNT_ID = os.environ.get('OFFEN_ACCOUNT_ID', None) diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index d70f7f3..a4daa11 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -11,12 +11,18 @@ COLORS .brd-cclr-mid-yellow { border-color: #F7BF08; } -.cclr-bright-yellow { +.cclr-yellow-bright { background-color: #fde28c; } +.fnt-cclr-yellow-bright { + color: #fde28c; +} .cclr-mid-mint { background-color: #BBD9D3; } +.fnt-cclr-mint-bright { + color: #E2F6F2; +} .cclr-mid-black { background-color: #39352A; } @@ -71,7 +77,6 @@ LAYOUT } - /* --------------------------------------------------- TYPO AND LAYOUT ELEMENTS ----------------------------------------------------*/ @@ -100,6 +105,10 @@ em { background: linear-gradient(transparent 66%, #fde28c 66%); font-style: normal; } +.em-extra { + background: linear-gradient(transparent 66%, #BBD9D3 66%); + font-style: normal; +} hr { margin-left: -1rem; margin-right: -1rem; @@ -116,14 +125,20 @@ ul { padding-inline-start: 1rem; } } +.tracked-min { + letter-spacing: .03em; +} +.intro-margin-a { + margin-top: 0.3rem; +} +.intro-margin-b { + margin-top: 0.7rem; +} /* --------------------------------------------------- MENU ----------------------------------------------------*/ -.nav-list { - margin: 0 0.7rem 0 0; -} .nav-bar { height: 4rem; } @@ -160,10 +175,19 @@ nav ul li a:visited { background: #F7BF08; color: #39352A; } +nav ul li:last-child a { + padding-right: 2rem; + background: #39352A; + color: #fff; +} nav ul li a:hover, nav ul li a:visited:hover { color: #39352A; } +nav ul li:last-child a:hover, +nav ul li:last-child a:visited:hover { + color: #fff; +} nav ul li a:not(:only-child):after, nav ul li a:visited:not(:only-child):after { padding-left: 0.4rem; @@ -212,17 +236,19 @@ nav ul li ul li a { nav ul li a { padding: 1rem; line-height: 1; - padding-left: 20%; + padding-left: 4.2rem; } nav ul li ul li a { padding-left: 30%; } nav ul li:last-child a { - padding-bottom: 4rem; - } - nav ul li:last-child a { - box-shadow: 0px 7px 15px -6px rgba(57,53,42,0.2); + padding-bottom: 1.2rem; + margin: 0; + box-shadow: 0px 7px 15px -6px rgba(57,53,42,0.2); } + nav ul li:first-child a { + padding-top: 0.2rem; + } .nav-dropdown { position: static; } @@ -306,7 +332,20 @@ IMAGES GRAPHICS ----------------------------------------------------*/ #bg-intro { - background: url(/theme/images/gfx-intro.svg) no-repeat center; + background: url(/theme/images/gfx-intro.svg); + background-repeat: no-repeat; + background-attachment: scroll; + background-position: 200px 130px; +} +@media only screen and (min-width: 30.1em) and (max-width: 60em) { + #bg-intro { + background-position: calc(20% + 120px) 130px; + } +} +@media only screen and (max-width: 30em) { + #bg-intro { + background-position: 10px 60px; + } } #bg-feature { background: url(/theme/images/gfx-pattern-mint-bright.svg) center; @@ -320,4 +359,3 @@ GRAPHICS #bg-cta-bottom { background: url(/theme/images/gfx-pattern-yellow-bright.svg) center; } - diff --git a/homepage/theme/static/images/offen-logo-social-media.jpg b/homepage/theme/static/images/offen-logo-social-media.jpg index 5796ad1..4a9112f 100644 Binary files a/homepage/theme/static/images/offen-logo-social-media.jpg and b/homepage/theme/static/images/offen-logo-social-media.jpg differ diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index dee3dd3..fc3d090 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -37,9 +37,11 @@ @@ -74,6 +80,7 @@ {% endblock %} + {% if is_getstarted != 'true' %} {% block outro %}
@@ -113,6 +120,7 @@
{% endblock %} + {% endif %}
@@ -123,6 +131,7 @@

for everyone

+ {% if is_getstarted != 'true' %}

{{CONTACT_EMAIL}}

@@ -135,8 +144,10 @@

Patreon

+ {% endif %}
+ {% if is_getstarted != 'true' %}

LinkedIn

@@ -146,6 +157,7 @@

Legal Notice

+ {% endif %}
{{ BUILD_DATE }} diff --git a/homepage/theme/templates/getstarted.html b/homepage/theme/templates/getstarted.html new file mode 100644 index 0000000..0aae636 --- /dev/null +++ b/homepage/theme/templates/getstarted.html @@ -0,0 +1,51 @@ +{% extends "page.html" %} + +{% set is_getstarted = 'true' %} + +{% block content %} +
+
+
+
+

+ Our alpha release +

+

+ Offen is in active development. Do something brave and test our latest alpha release today. It’s free and always will be. +

+
+
+

+ Single binary file for
Linux, Windows or MacOS +

+ Download + +
+
+
+
+
+
+
+
+

+ + Get started now + +

+

+ Running a website and need to collect usage statistics? Want to contribute as a developer? Our guides will help you kick off. +

+
+
+

+ Details on how to run, use
and develop Offen +

+ Open guides +
+
+
+
+{% endblock %} diff --git a/homepage/theme/templates/index.html b/homepage/theme/templates/index.html index f89f1e1..c759d30 100644 --- a/homepage/theme/templates/index.html +++ b/homepage/theme/templates/index.html @@ -3,11 +3,19 @@ {% block content %}
-
-
- Offen logo +
+
+ Offen logo
-
+
+
+
+ Offen logo +
+

+ Offen +

+

Transparent web analytics

@@ -15,7 +23,7 @@ Offen is an open source analytics software for websites and web applications. It allows respectful handling of data for operators and users.

@@ -26,7 +34,7 @@
-
+

Free & Open

@@ -34,7 +42,7 @@ Anyone can audit our open source code to verify it works as intended. Offen will always be available for free.

-
+

Fair & Secure

@@ -42,7 +50,7 @@ Pay respect to your website visitors and gain insights as a user at the same time. All data is encrypted end-to-end.

-
+

Easy to use

@@ -87,19 +95,49 @@ {% block outro %} -
-
-
-
-

- Ethical internet -

-

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

- Support us +
+
+
+
+

+ Our alpha release +

+

+ Offen is in active development. Do something brave and test our latest alpha release today. It’s free and always will be. +

+
+
+

+ Single binary file for
Linux, Windows or MacOS +

+ Download +
+
+
+
+
+
+

+ + Get started now + +

+

+ Running a website and need to collect usage statistics? Want to contribute as a developer? Our guides will help you kick off. +

+
+
+

+ Details on how to run, use
and develop Offen +

+ Open guides +
+
+
+
{% endblock %}