Merge branch 'dev' into 'testing'

# Conflicts: # .gitlab-ci.yml # ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml # ckanext-theme_hft/ckanext/theme_hft/templates/base.html # ckanext-theme_hft/ckanext/theme_hft/templates/footer.html

Merge branch 'dev' into 'testing'
# Conflicts: # .gitlab-ci.yml # ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml # ckanext-theme_hft/ckanext/theme_hft/templates/base.html # ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
c8486f18 · Rosanny Sihombing · ee21bb51 · d24e8e7c · c8486f18 · c8486f18
Commit c8486f18 authored 4 years ago by Rosanny Sihombing
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
+++ b/ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
 theme:
  filters: cssrewrite
-  output: assets/%(version)s_theme.css
+  output: katalog/assets/%(version)s_theme.css
  contents: theme.css
--- a/ckanext-theme_hft/ckanext/theme_hft/public/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png
+++ b/ckanext-theme_hft/ckanext/theme_hft/public/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png
--- a/ckanext-theme_hft/ckanext/theme_hft/public/M4_LAB_LOGO_Graustufen.png
+++ b/ckanext-theme_hft/ckanext/theme_hft/public/M4_LAB_LOGO_Graustufen.png
--- 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() }}
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
-	{% asset 'theme_hft/theme.css' %}
+	{% asset 'theme_hft/theme' %}
 {% endblock %}