move tags after titles on emisison and episode pages

diff --git a/panikweb_studioneau/static/css/style.scss b/panikweb_studioneau/static/css/style.scss
index 1f437e8143dd12e0fd917d653a0063727b3f9c30..2b5671be8e17541bdced7cfbef27ef761e1ce02b 100644 (file)
--- a/panikweb_studioneau/static/css/style.scss
+++ b/panikweb_studioneau/static/css/style.scss
@@ -470,6 +470,10 @@ ul.collection {
        }
 }
 
+h1 + .tags {
+       margin-top: -0.7rem;
+}
+
 .mehr-button {
        margin: 0 auto 4em auto;
        text-align: center;
@@ -639,6 +643,7 @@ ul.collection {
 .inner-page {
        h1 {
                margin-top: 0;
+               margin-bottom: 1.1rem;
                font-size: $font-size-title;
                font-weight: bold;
        }

diff --git a/panikweb_studioneau/templates/emissions/emission_detail.html b/panikweb_studioneau/templates/emissions/emission_detail.html
index ae618f425e715a6263edbf3d7519df87dfd53efb..1151b9411bac55cad2abd07ef4548af61bde7e26 100644 (file)
--- a/panikweb_studioneau/templates/emissions/emission_detail.html
+++ b/panikweb_studioneau/templates/emissions/emission_detail.html
@@ -20,9 +20,9 @@
 {% block backlink %}
 <a class="back" title="{% trans "Back to home" %}" href="{% url 'home' %}">{% trans "Back to home" %}</a>
 {% endblock %}
-{% include "includes/tags.html" with object=emission %}
 
 <h1 {% if emission.subtitle %}class="with-subtitle"{% endif %}>{{ emission.title }}{% if emission.subtitle %}<br>{{ emission.subtitle }}{% endif %}</h1>
+{% include "includes/tags.html" with object=emission %}
 
 {% block emission-text %}
 <div class="emission-text">

diff --git a/panikweb_studioneau/templates/emissions/episode_detail.html b/panikweb_studioneau/templates/emissions/episode_detail.html
index eeee26437fa65ac86c2d1e7eb0d377290c21bc03..5a1a4c0bbc6b3a8ee35caade9a64fad5de447870 100644 (file)
--- a/panikweb_studioneau/templates/emissions/episode_detail.html
+++ b/panikweb_studioneau/templates/emissions/episode_detail.html
@@ -21,9 +21,9 @@
 
 <div class="innest-page">
 <a class="back" title="{% trans "Back to emission" %}" href="{% url 'emission-view' slug=episode.emission.slug %}">{% trans "Back to emission" %}</a>
-{% include "includes/tags.html" with object=episode %}
 <h1><a href="{% url 'emission-view' slug=emission.slug %}">{{ emission.title }}</a><br>
         {{ episode.title }}{% if episode.subtitle %}<br>{{ episode.subtitle }}{% endif %}</h1>
+{% include "includes/tags.html" with object=episode %}
 {% if diffusions.exists %}
 <p class="diffusions">{% for diffusion in diffusions %}{{diffusion.datetime|date:"d.m.Y H.i"}} {% if not forloop.last %} | {% endif %}{% endfor %}</p>
 {% endif %}