From 8d1ac393e8d571a4f8c8720e9ac6269df7b95550 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Thu, 9 Feb 2017 15:10:31 +0100 Subject: [PATCH] Update article details --- app/static/src/sass/global/_typography.scss | 2 +- app/static/src/sass/modules/_page.scss | 17 ++++-- app/static/src/sass/modules/_share-links.scss | 23 ++++++-- app/templates/agenda/event_detail.html | 59 ++++++++----------- .../core/inc/related_content_dynamic.html | 29 +++++---- .../magazine/article/article_detail.html | 24 ++------ app/templates/pages/page.html | 11 +++- 7 files changed, 88 insertions(+), 77 deletions(-) diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss index 4a94d151..42041e2e 100755 --- a/app/static/src/sass/global/_typography.scss +++ b/app/static/src/sass/global/_typography.scss @@ -97,7 +97,7 @@ main p, main ul.unstyled-list, main ul:not([class]), main td { z-index: 1; text-decoration: none; border-bottom: 1px solid $color-main; - color: $color-main; + color: white; @include transition(all 0.15s ease-in-out); &:hover { diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss index 9eac8526..2ed9aef0 100644 --- a/app/static/src/sass/modules/_page.scss +++ b/app/static/src/sass/modules/_page.scss @@ -31,7 +31,9 @@ $module: ".page"; &__sidebar { @include mq($until: sm) { - background: white; + //background: white; + text-align: center; + @include margin-bottom(2); } } @@ -56,11 +58,15 @@ $module: ".page"; &__meta-separator { height: 1px; - background: black; + background: $color-main; width: 45px; @include margin(1 0); + @include mq($until: sm) { + @include margin(1 auto); + } + &--small { @include margin(.5 0); } @@ -85,10 +91,11 @@ $module: ".page"; &__meta-title { - @include font-size(m); + @include font-size(s); @include line-height(1); - @include typeface(serif); - font-weight: weight(heavy); + @include typeface(sans-serif); + text-transform: uppercase; + font-weight: weight(regular); &--small { @include font-size(s); diff --git a/app/static/src/sass/modules/_share-links.scss b/app/static/src/sass/modules/_share-links.scss index 79e2bffa..4e36dfee 100644 --- a/app/static/src/sass/modules/_share-links.scss +++ b/app/static/src/sass/modules/_share-links.scss @@ -25,13 +25,28 @@ $module: ".share-links"; list-style-type: none; padding: 0; margin: 0; - @include margin-top(2); + @include margin-top(0); &__item { - display: inline-block; - font-size: 1.25rem; - @include margin-right(.5); + display: block; + font-size: 2rem; + @include margin-bottom(.5); + color: white; + + @include mq($until: sm) { + display: inline-block; + @include margin-right(.5); + } + + a { + color: white; + @include transition(all 0.5s ease-in-out); + + &:hover { + color: $color-main; + } + } } diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index df4d6e40..60920d64 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -48,7 +48,7 @@ {% if child %} {% with child.links.all as links %} {% if links %} -
+
{% include 'core/inc/link.html' %}
{% endif %} @@ -56,14 +56,14 @@ {% else %} {% with event.links.all as links %} {% if links %} -
+
{% include 'core/inc/link.html' %}
{% endif %} {% endwith %} {% endif %} {% if event.mentions %} -
+
{{ event.mentions }}
@@ -93,30 +93,35 @@ {% block page_person_list %} {% if event.persons.all %} -
-
+
-
-

- {% if event.trainings.all %} - {% trans "Trainers" %}
- {% else %} - {% trans "Persons" %}
- {% endif %} -

+
+
+

+ {% if event.trainings.all %} + {% trans "Trainers" %}
+ {% else %} + {% trans "Persons" %}
+ {% endif %} +

+
-
- {% for person in event.persons.all %} - {% with person.person as person %} - {% include "network/inc/person/person_card_circle.html" %} - {% endwith %} - {% endfor %} +
+
+ {% for person in event.persons.all %} + {% with person.person as person %} +
+ {% include "network/inc/person/person_card_square.html" %} +
+ {% endwith %} + {% endfor %} +
@@ -131,20 +136,8 @@ {% endblock %} {% block page_sidebar %} -
- {% block event_detail_postedby %} - {% editable event.start event.end event.location %} - {% with True as unit_booking %} - {% include 'agenda/includes/event_metainfo.html' %} - {% endwith %} - {% endeditable %} - {% endblock %} - {% set_short_url_for event %} - {% with event as object %} - {% with True as is_event %} - {% include "includes/share_buttons.html" %} - {% endwith %} - {% endwith %} +
+ {% include "includes/share_buttons.html" %}
{% endblock %} diff --git a/app/templates/core/inc/related_content_dynamic.html b/app/templates/core/inc/related_content_dynamic.html index a1236f58..1d890c25 100644 --- a/app/templates/core/inc/related_content_dynamic.html +++ b/app/templates/core/inc/related_content_dynamic.html @@ -1,23 +1,26 @@ {% load i18n mezzanine_tags keyword_tags organization_tags pages_tags %} {% if concrete_objects %} -
-
+
-
-

{% if object.related_title.title %}{{ object.related_title.title }}{% else %}{% trans "Also discover" %}{% endif %}

+
+

{% if object.related_title.title %}{{ object.related_title.title }}{% else %}{% trans "Also discover" %}{% endif %}

-
- {% for concrete_object in concrete_objects %} -
- {% with app_label=concrete_object|app_label_short classname=concrete_object|classname|lower object=concrete_object %} - {% with app_label|add:"/"|add:classname|add:"/includes/"|add:classname|add:"_card.html" as template %} - {% include template %} - {% endwith %} - {% endwith %} +
+
+
+ {% for concrete_object in concrete_objects %} +
+ {% with app_label=concrete_object|app_label_short classname=concrete_object|classname|lower object=concrete_object %} + {% with app_label|add:"/"|add:classname|add:"/includes/"|add:classname|add:"_card.html" as template %} + {% include template %} + {% endwith %} + {% endwith %} +
+ {% endfor %}
- {% endfor %} +
diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html index 46c1be51..06ff724d 100644 --- a/app/templates/magazine/article/article_detail.html +++ b/app/templates/magazine/article/article_detail.html @@ -22,28 +22,10 @@ {% endif %} {% endblock %} -{% block breadcrumb_menu %} - {{ block.super }} -
  • {{ article.title }}
    • -{% endblock %} - -{% block page_tags %} - - {% if department_name %} -
    - {{ department_name }} -
    - {% endif %} -
    - {% trans 'News' %} -
    - -{% endblock %} - {% block page_title %} {% editable article.title %} -

    {{ article.title }}

    +

    {{ article.title }}

    {% endeditable %} {% if article.sub_title %} @@ -122,7 +104,9 @@ {% endif %} {% with article as object %} - {% include "includes/share_buttons.html" %} +
    + {% include "includes/share_buttons.html" %} +
    {% endwith %}
    diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html index 146c8ca6..f940ffc7 100644 --- a/app/templates/pages/page.html +++ b/app/templates/pages/page.html @@ -35,7 +35,16 @@
    -
    +
    + +
    + {% block page_sidebar %} + {% endblock %} +
    + +
    + +
    {% block page_content %} {{ page.content }} {% endblock %} -- 2.39.5