fonts: integrate Abril Fatface like other fonts (#40197)

This commit is contained in:
Frédéric Péters 2020-02-26 08:41:45 +01:00
parent 8ac1d03e3e
commit ae194efaa6
11 changed files with 38 additions and 13 deletions

9
README
View File

@ -256,6 +256,15 @@ copyright notices:
#
# https://www.fontsquirrel.com/license/noto-sans
* Abril Fatface
# Copyright (c) 2011, Copyright (c) 2011, TypeTogether
# (www.type-together.com info@type-together.com),
# with Reserved Font Names “Abril” and “Abril Fatface”
#
# This Font Software is licensed under the SIL Open Font License, Version 1.1.
#
# https://www.fontsquirrel.com/license/abril-fatface
~~~~
Some theme variant files have their own specific licenses; refer to

2
debian/50fonts.py vendored
View File

@ -1,2 +0,0 @@
# add xstatics with fonts
INSTALLED_APPS += ('xstatic.pkg.abril_fatface',)

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Homepage: http://git.entrouvert.org/publik-base-theme.git
Package: publik-base-theme
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface, python3-xstatic-abrilfatface
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0),
python-django (<= 1:1.11),
python-xstatic-roboto-fontface (< 0.5.0.0),

View File

@ -1 +0,0 @@
debian/50fonts.py /etc/combo/settings.d

19
debian/publik-base-theme.postinst vendored Normal file
View File

@ -0,0 +1,19 @@
#! /bin/sh
set -e
case "$1" in
configure)
# remove old conffile if it was not edited.
if [ -e /etc/combo/settings.d/50fonts.py ]; then
HASH=$(md5sum < /etc/combo/settings.d/50fonts.py | cut -d ' ' -f1)
if [ x"$HASH" = x"3bb0e0249725a52c181a1e0ff9138de2" ]; then
rm /etc/combo/settings.d/50fonts.py
fi
fi
;;
esac
#DEBHELPER#
exit 0

View File

@ -16,7 +16,7 @@ $nav-item-selected-color: white;
$nav-item-hover-color: white;
$nav-after-image: false;
$button-background: darken($primary-color, 10%);
$title-font-family: 'AbrilFatface-Regular', Arial, Helvetica, sans-serif;
$title-font-family: 'Abril Fatface', Arial, Helvetica, sans-serif;
$title-background: $primary-color;
$title-weight: regular;
$title-color: #CF0D8A;

View File

@ -1,6 +1,6 @@
@charset "UTF-8";
@import '../includes/font-abrilfatface-regular';
@import '../includes/font-abrilfatface';
@import 'vars';
@import '../includes/publik';
@import '../includes/categories';

Binary file not shown.

View File

@ -1,6 +0,0 @@
$font-path: '/static/xstatic/fonts' !default;
@font-face {
font-family: 'AbrilFatface-Regular';
src: url('#{$font-path}/Regular/abrilfatface-regular.woff') format('woff');
}

View File

@ -0,0 +1,6 @@
@font-face {
font-family: 'Abril Fatface';
src: url(/static/fonts/AbrilFatface/abrilfatface-regular.woff) format('woff');
font-weight: normal;
font-style: normal;
}

View File

@ -2,7 +2,7 @@
{% load static i18n combo gadjo %}
{% block extra_top_head %}
<link rel="preload" href="{{site_base}}/static/xstatic/fonts/Regular/abrilfatface-regular.woff" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{{site_base}}/static/fonts/AbrilFatface/abrilfatface-regular.woff" as="font" type="font/woff" crossorigin>
{% endblock %}
{% block header-title %}