Update article details

diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss
index 4a94d15172d7dcd32b478a8298089b2066f50d82..42041e2eb0c91a2b90a91871764623ce6a204402 100755 (executable)
--- 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 9eac8526838f1b1fa1460eaa974d698a6ff4e231..2ed9aef059ce467ada09f423537861b698c0489c 100644 (file)
--- 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 79e2bffa8a1ac1f488c39b61c8d100675027f993..4e36dfee037b21fa08f29dc579e1123459554293 100644 (file)
--- 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 df4d6e403416f48f29f2ee2137c9dea15e027005..60920d6442d0b45183fb435486aa1e57ef2c7de2 100644 (file)
--- 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 %}
-                        <div class="col-xs-6">
+                        <div class="col-xs-8">
                             {% include 'core/inc/link.html' %}
                         </div>
                     {% endif %}
@@ -56,14 +56,14 @@
             {% else %}
                 {% with event.links.all as links %}
                     {% if links %}
-                        <div class="col-xs-6">
+                        <div class="col-xs-8">
                             {% include 'core/inc/link.html' %}
                         </div>
                     {% endif %}
                 {% endwith %}
             {% endif %}
             {% if event.mentions %}
-                <div class="col-xs-6">
+                <div class="col-xs-8">
                     <div class="small-text">
                         {{ event.mentions }}
                    </div>
@@ -93,30 +93,35 @@
 
 {% block page_person_list %}
     {% if event.persons.all %}
-        <div class="white-bg pb2">
-            <hr class="mt0" />
+        <div class="pb2">
             <div class="container">
                 <div class="row">
-                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2" data-summary-content>
-                        <h2 class="dotted">
-                            {% if event.trainings.all %}
-                                {% trans "Trainers" %}<br>
-                            {% else %}
-                                {% trans "Persons" %}<br>
-                            {% endif %}
-                        </h2>
+                    <div class="col-xxs-16 col-md-10 col-md-push-3" data-summary-content>
+                        <div class="tac">
+                            <h2 class="section-title section-title--uppercase section-title--main section-title--underline">
+                                {% if event.trainings.all %}
+                                    {% trans "Trainers" %}<br>
+                                {% else %}
+                                    {% trans "Persons" %}<br>
+                                {% endif %}
+                            </h2>
+                        </div>
                     </div>
                 </div>
             </div>
 
             <div class="container">
                 <div class="row">
-                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                        {% for person in event.persons.all %}
-                                {% with person.person as person %}
-                                    {% include "network/inc/person/person_card_circle.html" %}
-                                {% endwith %}
-                        {% endfor %}
+                    <div class="col-md-8 col-md-push-4">
+                        <div class="row">
+                            {% for person in event.persons.all %}
+                                    {% with person.person as person %}
+                                        <div class="col-md-8">
+                                            {% include "network/inc/person/person_card_square.html" %}
+                                        </div>
+                                    {% endwith %}
+                            {% endfor %}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -131,20 +136,8 @@
 {% endblock %}
 
 {% block page_sidebar %}
-    <div class="page__meta" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
-        {% 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 %}
+    <div class="" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
+        {% include "includes/share_buttons.html" %}
     </div>
 {% endblock %}
 

diff --git a/app/templates/core/inc/related_content_dynamic.html b/app/templates/core/inc/related_content_dynamic.html
index a1236f584c297e779a75ea93ca8dd16d08187e38..1d890c253f20dfd02909a8131cdc6a8621937f81 100644 (file)
--- 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 %}
-    <hr class="mt0 mb0" />
-    <div class="white-bg pb2">
+    <div class="pb2">
         <div class="container">
             <div class="row tac">
-                <div class="col-xs-12">
-                    <h2 class="dashed dashed--center mt2">{% if object.related_title.title %}{{ object.related_title.title }}{% else %}{% trans "Also discover" %}{% endif %}</h2>
+                <div class="col-xs-16">
+                    <h2 class="section-title section-title--underline section-title--uppercase section-title--main">{% if object.related_title.title %}{{ object.related_title.title }}{% else %}{% trans "Also discover" %}{% endif %}</h2>
                 </div>
             </div>
-            <div class="row tac">
-                {% for concrete_object in concrete_objects %}
-                    <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                        {% 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 %}
+            <div class="row">
+                <div class="col-md-10 col-md-push-3 col-xxs-16">
+                    <div class="row">
+                        {% for concrete_object in concrete_objects %}
+                            <div class="col-xs-8">
+                                {% 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 %}
+                            </div>
+                        {% endfor %}
                     </div>
-                {% endfor %}
+                </div>
             </div>
         </div>
     </div>

diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index 46c1be518c214959134ab7080afb59279d070f68..06ff724deeb7e33ec59c04644753bd839af3530a 100644 (file)
--- 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 }}
-    <li class="breadcrumb__item active">{{ article.title }}</li>
-{% endblock %}
-
-{% block page_tags %}
-
-    {% if department_name %}
-        <div class="tag dashed dashed--gray">
-          {{ department_name }}
-        </div>
-    {% endif %}
-    <div class="tag tag--category">
-        {% trans 'News' %}
-    </div>
-
-{% endblock %}
-
 {% block page_title %}
 
     {% editable article.title %}
-        <h1 class="dotted">{{ article.title }}</h1>
+        <h1 class="section-title section-title--uppercase section-title--main">{{ article.title }}</h1>
     {% endeditable %}
 
     {% if article.sub_title %}
@@ -122,7 +104,9 @@
         {% endif %}
 
         {% with article as object %}
-            {% include "includes/share_buttons.html" %}
+            <div class="mt2">
+                {% include "includes/share_buttons.html" %}
+            </div>
         {% endwith %}
     </div>
 

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index 146c8ca61a59f2f98605afb3f4be547b06ab722f..f940ffc7c8fb0e4411029792996d8912b6a6006b 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -35,7 +35,16 @@
 
             <div class="row">
 
-                <div class="mb2 col-sm-16 col-md-10 col-md-push-3 page__content" data-summary-content>
+                <div class="col-md-3 page__sidebar">
+
+                    <div style="position: relative;">
+                        {% block page_sidebar %}
+                        {% endblock %}
+                    </div>
+
+                </div>
+
+                <div class="mb2 col-sm-16 col-md-10 page__content" data-summary-content>
                     {% block page_content %}
                         {{ page.content }}
                     {% endblock %}