Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add local fonts, fixes #213 #254

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 195 additions & 0 deletions wbcore/static/css/fonts.css

Large diffs are not rendered by default.

Binary file not shown.
326 changes: 326 additions & 0 deletions wbcore/static/fonts/bree-serif-v17-latin-ext_latin-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
17 changes: 1 addition & 16 deletions wbcore/static/klaro/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ var klaroConfig = {
klaro: {
description: 'Verwaltung des Einverständnis',
},
google_fonts: {
description: 'Web-Schriftarten von Google gehostet',
},
google_tag_manager: {
description: 'Die Google-Konzernunternehmen wie Google LLC und Google Ireland Limited verarbeiten die übermittelten Anfrage-Daten (z.B. IP-Adresse), Nutzungs- (z.B. aufgerufene Seiten) und Werbekampagnen-Daten darüber hinaus zu eigenen Zwecken und verknüpfen diese womöglich mit weiteren Daten wie deinen Account-Daten. Die Verarbeitungen erfolgen teilweise in den USA, wo kein mit der EU vergleichbares Datenschutzniveau garantiert ist und insbesondere staatliche Behörden Zugriff auf die verarbeiteten Daten haben können. Zur Google-Datenschutzerklärung: https://policies.google.com/privacy?hl=de',
},
Expand Down Expand Up @@ -106,9 +103,6 @@ var klaroConfig = {
klaro: {
description: 'Consent management',
},
google_fonts: {
description: 'Web fonts hosted by Google',
},
google_tag_manager: {
description: 'Simplified integration of website content like statistic tools and performance optimization',
},
Expand Down Expand Up @@ -188,15 +182,6 @@ var klaroConfig = {
},

// The apps will appear in the modal in the same order as defined here.
{
name: 'google_fonts',
title: 'Google Fonts',
purposes: ['functionality'],
required: true,
callback: function(consent, app){
console.log('User consent for app ' + app.name + ': consent=' + consent);
}
},
{
name: 'google_tag_manager',
title: 'Google Tag Manger',
Expand Down Expand Up @@ -246,4 +231,4 @@ klaroConfig.translations.es = klaroConfig.translations.en



klaro:"%7B%22klaro%22%3Atrue%2C%22google_fonts%22%3Atrue%2C%22google_tag_manager%22%3Atrue%2C%22google_analytics%22%3Atrue%2C%22google_ad%22%3Afalse%7D"
klaro:"%7B%22klaro%22%3Atrue%2C%2C%22google_tag_manager%22%3Atrue%2C%22google_analytics%22%3Atrue%2C%22google_ad%22%3Afalse%7D"
2 changes: 1 addition & 1 deletion wbcore/templates/wbcore/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{% endblock %}

<link rel="stylesheet" type="text/css" href="{% static 'semantic/dist/semantic.min.css' %}">
<link href="{% static 'css/fonts.css' %}" rel="stylesheet" type="text/css" />

{% load sass_tags %}
<link href="{% sass_src 'css/wbcore.scss' %}" rel="stylesheet" type="text/css" />
Expand All @@ -25,7 +26,6 @@

<link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}"/>
<link rel="icon" href="{% static 'favicon.ico' %}" type="image/x-icon">
<link href="https://fonts.googleapis.com/css?family=Bree+Serif|Open+Sans|Open+Sans+Condensed:700" rel="stylesheet">

<!-- PhotoSwipe -->
<link rel="stylesheet" href="{% static 'PhotoSwipe/dist/photoswipe.css' %}">
Expand Down