From cb185a4500abaf52b83f5991eb8489bf38355034 Mon Sep 17 00:00:00 2001 From: Yohan Boniface <yb@enix.org> Date: Mon, 24 Apr 2017 18:56:31 +0200 Subject: [PATCH] More theming hooks --- umap/static/umap/theme.css | 1 + umap/static/umap/umap.css | 2 +- umap/templates/base.html | 1 + umap/templates/umap/content.html | 4 +--- umap/templates/umap/content_footer.html | 3 +++ umap/templates/umap/navigation.html | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 umap/static/umap/theme.css create mode 100644 umap/templates/umap/content_footer.html diff --git a/umap/static/umap/theme.css b/umap/static/umap/theme.css new file mode 100644 index 0000000..8982178 --- /dev/null +++ b/umap/static/umap/theme.css @@ -0,0 +1 @@ +/* Override this file for theming uMap easily */ diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css index dd841a5..5f78d76 100644 --- a/umap/static/umap/umap.css +++ b/umap/static/umap/umap.css @@ -334,7 +334,7 @@ footer { line-height: 140px; color: #8F96A3; } -footer a { +footer a.branding { background-image: url("./img/logo_filigree.png"); background-position: left center; background-repeat: no-repeat; diff --git a/umap/templates/base.html b/umap/templates/base.html index 6d7f2fd..2bc062d 100644 --- a/umap/templates/base.html +++ b/umap/templates/base.html @@ -8,6 +8,7 @@ <!-- Included CSS Files (Compressed) --> <link rel="stylesheet" href="{{ STATIC_URL }}storage/contrib/css/storage.ui.default.css"> <link rel="stylesheet" href="{{ STATIC_URL }}umap/umap.css"> + <link rel="stylesheet" href="{{ STATIC_URL }}umap/theme.css"> {% endcompress css %} <!-- IE Fix for HTML5 Tags --> <!--[if lt IE 9]> diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html index 985da5c..d5189d4 100644 --- a/umap/templates/umap/content.html +++ b/umap/templates/umap/content.html @@ -74,7 +74,5 @@ {% block footer %} {{ block.super }} - <footer> - <a href="/">umap</a> an OpenStreetMap project (version {{ UMAP_VERSION }}) - </footer> + {% include "umap/content_footer.html" %} {% endblock footer %} diff --git a/umap/templates/umap/content_footer.html b/umap/templates/umap/content_footer.html new file mode 100644 index 0000000..f87db16 --- /dev/null +++ b/umap/templates/umap/content_footer.html @@ -0,0 +1,3 @@ +<footer> + <a href="/" class="branding">umap</a> an OpenStreetMap project (version {{ UMAP_VERSION }}) +</footer> diff --git a/umap/templates/umap/navigation.html b/umap/templates/umap/navigation.html index 3574e63..3715263 100644 --- a/umap/templates/umap/navigation.html +++ b/umap/templates/umap/navigation.html @@ -2,7 +2,7 @@ <nav> <section class="col quarter branding twide"> <ul> - <li class="name"><h1><a href="/">umap</a></h1></li> + <li class="name"><h1><a href="/">{{ SITE_NAME }}</a></h1></li> </ul> </section> -- GitLab