diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1378e0020e07bab09ff56cadc4af60e54cf969ba..e682981978a35cee92a2eb747dff37783139f6c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ devel: - cd /usr/lib/ckan/default/src/ckanext-theme_hft - python setup.py develop - deactivate + - supervisorctl restart all tags: - testing only: diff --git a/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml b/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml index c1b5cc3862c0727e530f1f225214e943e9a76fea..307ad5e604a702bc34ccb82038bb061f41890696 100644 --- a/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml +++ b/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml @@ -1,4 +1,6 @@ -theme: +theme-css: + contents: + - theme.css filters: cssrewrite - output: katalog/assets/%(version)s_theme.css - contents: theme.css + output: theme_hft/%(version)s_theme.css + diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/base.html b/ckanext-theme_hft/ckanext/theme_hft/templates/base.html index 2184648a3d0e4db693c47e2477a121ebbdc0e698..ddf8e7c555945b8cc353caf646bbe32cc38e67cb 100644 --- a/ckanext-theme_hft/ckanext/theme_hft/templates/base.html +++ b/ckanext-theme_hft/ckanext/theme_hft/templates/base.html @@ -3,5 +3,5 @@ {% block styles %} {{ super() }} - {% asset 'theme_hft/theme' %} + {% asset 'theme_hft/theme-css' %} {% endblock %} diff --git a/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html b/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html index 23f08fa5ca81863980eae1136ba49bf00a7770e7..36696af153016295d8eb4bbe2c01603a7fdda942 100644 --- a/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html +++ b/ckanext-theme_hft/ckanext/theme_hft/templates/footer.html @@ -4,10 +4,10 @@ {% block footer_content %}