2
0
mirror of https://github.com/offen/website.git synced 2024-11-23 09:20:33 +01:00

Merge pull request #31 from offen/development

update font display and overscroll color
This commit is contained in:
Hendrik Niefeld 2020-01-02 17:23:21 +01:00 committed by GitHub
commit 1b3b31dad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 114 additions and 115 deletions

View File

@ -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. *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) [hioffen@posteo.de](mailto:hioffen@posteo.de)
[Email GPG Key](/theme/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc){: target="_blank"} [GPG Key](/theme/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc){: target="_blank"}

View File

@ -82,8 +82,6 @@ TYPO AND LAYOUT ELEMENTS
body { body {
overflow-wrap: break-word; overflow-wrap: break-word;
overscroll-behavior: none; overscroll-behavior: none;
/* overscroll color */
background-color: #39352A;
} }
/* Custom Tachyons class */ /* Custom Tachyons class */
.f25 { .f25 {

View File

@ -1,7 +1,7 @@
/* rubik-regular - latin */ /* rubik-regular - latin */
@font-face { @font-face {
font-family: 'Rubik'; font-family: 'Rubik';
font-display: swap; font-display: block;
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Rubik'), local('Rubik-Regular'), src: local('Rubik'), local('Rubik-Regular'),
@ -12,7 +12,7 @@
/* rubik-700 - latin */ /* rubik-700 - latin */
@font-face { @font-face {
font-family: 'Rubik'; font-family: 'Rubik';
font-display: swap; font-display: block;
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: local('Rubik Bold'), local('Rubik-Bold'), src: local('Rubik Bold'), local('Rubik-Bold'),

View File

@ -32,126 +32,127 @@
{% endif %} {% endif %}
</head> </head>
{% endblock %} {% endblock %}
<body class="{{ template }} f5 rubik lh-copy fnt-cclr-mid-black cclr-dark-white"> <body class="{{ template }} f5 rubik lh-copy fnt-cclr-mid-black cclr-mid-black">
<div class="menu w-100 cclr-mid-yellow"> <div class="cclr-dark-white">
<section class="nav-bar"> <div class="menu w-100 cclr-mid-yellow">
<div class="nav-container"> <section class="nav-bar">
<div class="icon"> <div class="nav-container">
<a href="/"><img src="/theme/images/offen-icon-white.svg" alt="Offen logo" width="37" height="40" class="logo"></a> <div class="icon">
<a href="/"><img src="/theme/images/offen-icon-white.svg" alt="Offen logo" width="37" height="40" class="logo"></a>
</div>
<nav>
<div class="nav-mobile"><span id="nav-toggle"><span></span></span></div>
<ul class="nav-list">
<li>
<a class="b link dim fnt-cclr-mid-black" href="/">Summary</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="/deep-dive/">Deep dive</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="/blog/">Status</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="/about/">About</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a>
</li>
</ul>
</nav>
</div> </div>
<nav> </section>
<div class="nav-mobile"><span id="nav-toggle"><span></span></span></div> </div>
<ul class="nav-list"> {% block content %}
<li> <div class="w-100 mt5-ns gray">
<a class="b link dim fnt-cclr-mid-black" href="/">Summary</a> <div class="mw7 center pt5 pb5 ph3 ph5-ns bg-white">
</li> {{ content }}
<li> </div>
<a class="b link dim fnt-cclr-mid-black" href="/deep-dive/">Deep dive</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="/blog/">Status</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="/about/">About</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a>
</li>
<li>
<a class="b link dim fnt-cclr-mid-black" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a>
</li>
</ul>
</nav>
</div>
</section>
</div>
{% block content %}
<div class="w-100 mt5-ns gray">
<div class="mw7 center pt5 pb5 ph3 ph5-ns bg-white">
{{ content }}
</div> </div>
</div> {% endblock %}
{% endblock %}
{% block outro %} {% block outro %}
<div class="w-100 cclr-mid-yellow"> <div class="w-100 cclr-mid-yellow">
<div class="pt3 pb6 ph3" id="bg-cta-bottom"> <div class="pt3 pb6 ph3" id="bg-cta-bottom">
<div class="mw8 center"> <div class="mw8 center">
<div class="flex flex-wrap justify-center"> <div class="flex flex-wrap justify-center">
<div class="w55 mh3 pt5 tc"> <div class="w55 mh3 pt5 tc">
<h2 class="f25 lh-solid ma0 mb3"> <h2 class="f25 lh-solid ma0 mb3">
Participate Participate
</h2> </h2>
<p class="ma0 mb3"> <p class="ma0 mb3">
Development of Offen has just started. Do not hesitate to make a contribution and help us handle data with respect. Development of Offen has just started. Do not hesitate to make a contribution and help us handle data with respect.
</p> </p>
<a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="{{GITHUB_ORG}}" rel="noopener" target="_blank">Get involved</a> <a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="{{GITHUB_ORG}}" rel="noopener" target="_blank">Get involved</a>
</div> </div>
{% if is_article != 'true' %} {% if is_article != 'true' %}
<div class="w55 mh3 pt5 tc"> <div class="w55 mh3 pt5 tc">
<h2 class="f25 lh-solid ma0 mb3"> <h2 class="f25 lh-solid ma0 mb3">
In the making In the making
</h2> </h2>
<p class="ma0 mb3"> <p class="ma0 mb3">
Offen is still in alpha. Discover what is already up and running and where we want to go in the coming months. Offen is still in alpha. Discover what is already up and running and where we want to go in the coming months.
</p> </p>
<a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="/blog/">Project status</a> <a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="/blog/">Project status</a>
</div> </div>
{% endif %} {% endif %}
<div class="w55 mh3 pt5 tc"> <div class="w55 mh3 pt5 tc">
<h2 class="f25 lh-solid ma0 mb3"> <h2 class="f25 lh-solid ma0 mb3">
Ethical internet Ethical internet
</h2> </h2>
<p class="ma0 mb3"> <p class="ma0 mb3">
We're working hard to ensure that Offen is independent and can be sustained for years to come. We're working hard to ensure that Offen is independent and can be sustained for years to come.
</p> </p>
<a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Support us</a> <a class="b link dim ph4 pv2 dib b--solid bw2 brd-cclr-mid-black fnt-cclr-mid-black" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Support us</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endblock %}
{% endblock %} <div class="w-100 cclr-mid-black gray ph4"> <!--footer-->
<div class="w-100 cclr-mid-black gray ph4"> <!--footer--> <div class="flex flex-row-l flex-column w-100-l mw6-m center-m pt4 pb6">
<div class="flex flex-row-l flex-column w-100-l mw6-m center-m pt4 pb6"> <div class="w-25-l mt3 mr3 fnt-cclr-mid-yellow">
<div class="w-25-l mt3 mr3 fnt-cclr-mid-yellow"> <p class="ma0">
<p class="ma0"> <a class="b link dim fnt-cclr-mid-yellow" href="/">Offen</a>
<a class="b link dim fnt-cclr-mid-yellow" href="/">Offen</a> </p>
</p> <p class="ma0">Transparent web analytics</p>
<p class="ma0">Transparent web analytics</p> <p class="ma0">for everyone</p>
<p class="ma0">for everyone</p> </div>
</div> <div class="w-25-l mt3 mr3">
<div class="w-25-l mt3 mr3"> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" href="mailto:{{ CONTACT_EMAIL }}">{{CONTACT_EMAIL}}</a>
<a class="link b dim gray" href="mailto:{{ CONTACT_EMAIL }}">{{CONTACT_EMAIL}}</a> </p>
</p> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" target="_blank" href="/theme/{{ GPG_KEY_FILE }}">GPG Key</a>
<a class="link b dim gray" target="_blank" href="/theme/{{ GPG_KEY_FILE }}">GPG Key</a> </p>
</p> <p class="ma0 mt2">
<p class="ma0 mt2"> <a class="link b dim gray" href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a>
<a class="link b dim gray" href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a> </p>
</p> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a>
<a class="link b dim gray" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a> </p>
</p> </div>
</div> <div class="w-25-l mt3 mr3">
<div class="w-25-l mt3 mr3"> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" href="{{ LINKEDIN_URL }}" rel="noopener" target="_blank">LinkedIn</a>
<a class="link b dim gray" href="{{ LINKEDIN_URL }}" rel="noopener" target="_blank">LinkedIn</a> </p>
</p> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" href="{{ TWITTER_URL }}" rel="noopener" target="_blank">Twitter</a>
<a class="link b dim gray" href="{{ TWITTER_URL }}" rel="noopener" target="_blank">Twitter</a> </p>
</p> <p class="ma0">
<p class="ma0"> <a class="link b dim gray" href="/legal-notice/">Legal Notice</a>
<a class="link b dim gray" href="/legal-notice/">Legal Notice</a> </p>
</p> </div>
</div> <div class="w-25-l mt3 tr-l">
<div class="w-25-l mt3 tr-l"> {{ BUILD_DATE }}
{{ BUILD_DATE }} </div>
</div> </div>
</div> </div>
</div> </div>
{% block scripts %} {% block scripts %}
{% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %}
<script src="/{{ ASSET_URL }}"></script> <script src="/{{ ASSET_URL }}"></script>