From 1210c43ce0a7ab17ab7f09a40ec0073b7d5b9cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 5 Sep 2017 15:21:23 +0200 Subject: [PATCH] misc: add xstatic of fonts, for theming comfort (#18454) --- combo/settings.py | 2 ++ debian/control | 2 ++ requirements.txt | 2 ++ setup.py | 2 ++ 4 files changed, 8 insertions(+) diff --git a/combo/settings.py b/combo/settings.py index d0c1e5fa..6014efc4 100644 --- a/combo/settings.py +++ b/combo/settings.py @@ -82,6 +82,8 @@ INSTALLED_APPS = ( 'haystack', 'xstatic.pkg.chartnew_js', 'xstatic.pkg.leaflet', + 'xstatic.pkg.opensans', + 'xstatic.pkg.roboto_fontface', ) INSTALLED_APPS = plugins.register_plugins_apps(INSTALLED_APPS) diff --git a/debian/control b/debian/control index eebca024..3becbcb9 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,8 @@ Depends: ${misc:Depends}, ${python:Depends}, python-django-cmsplugin-blurp, python-xstatic-chartnew-js, python-xstatic-leaflet, + python-xstatic-opensans, + python-xstatic-roboto-fontface, python-eopayment (>= 1.9), python-django-haystack (>= 2.4.0), python-sorl-thumbnail, diff --git a/requirements.txt b/requirements.txt index eb70fa9e..660784f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,8 @@ django-jsonfield requests XStatic-ChartNew.js XStatic-Leaflet +XStatic_OpenSans +XStatic_roboto-fontface eopayment>=1.13 python-dateutil djangorestframework>=3.3, <3.4 diff --git a/setup.py b/setup.py index 280cbf5c..b2df0370 100644 --- a/setup.py +++ b/setup.py @@ -112,6 +112,8 @@ setup( 'requests', 'XStatic-ChartNew.js', 'XStatic-Leaflet', + 'XStatic_OpenSans', + 'XStatic_roboto-fontface', 'eopayment>=1.13', 'python-dateutil', 'djangorestframework>=3.3, <3.4',