Commit 9f8cc187 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

Merge branch 'dev' into 'testing'

# Conflicts:
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
parents a6b26f80 9d73abf3
Pipeline #3656 passed with stage
in 14 seconds
......@@ -23,7 +23,6 @@ The extension and files for the customization are structured as follows in the *
1. Run the following command to create a new extension and place its directory in the **`ckan`** source code's parent directory:
> ckan generate extension
- New extension name: _`ckanext-theme_hft`_
- theme name: _`theme_hft`_
1. Put the files in this repo to the their respective directories.
1. Go to **`ckanext-theme_hft`** directory and run the following command:
> python setup.py develop
......
......@@ -30,7 +30,7 @@
@media (min-width: 768px) {
.hero {
background: url("/header.jpg");
background: url("https://m4lab.hft-stuttgart.de/katalog/header.jpg");
}
}
......
theme-css:
contents:
- theme.css
filters: cssrewrite
output: theme_hft/%(version)s_theme.css
theme:
output: theme_hft/theme.css
contents: theme.css
......@@ -4,10 +4,10 @@
{% block footer_content %}
<div class="row">
<div class="col-md-4 attribution">
<img src="/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" height='90'/>
<img src="https://m4lab.hft-stuttgart.de/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" height='90'/>
</div>
<div class="col-md-2 attribution">
<img src="/img/footer/M4_LAB_LOGO_Graustufen.png" height='80'/>
<img src="https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png" height='80'/>
</div>
<div class="col-md-3 footer-links">
<a href="https://twitter.com/InnolabM4">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment