2
0
mirror of https://github.com/offen/website.git synced 2024-10-19 04:20:28 +02: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,7 +32,8 @@
{% 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="cclr-dark-white">
<div class="menu w-100 cclr-mid-yellow"> <div class="menu w-100 cclr-mid-yellow">
<section class="nav-bar"> <section class="nav-bar">
<div class="nav-container"> <div class="nav-container">
@ -151,7 +152,7 @@
</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>