From 8259dc529134d9c15ab8de1d3730df3d271bccea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Wed, 15 Feb 2017 11:57:10 +0100 Subject: [PATCH] Updates and fixes for mobile devices --- app/static/src/sass/global/_typography.scss | 8 +++ .../src/sass/modules/_section-title.scss | 11 ++++ app/static/src/sass/modules/_share-links.scss | 2 +- .../src/sass/modules/boxes/_article-box.scss | 4 ++ app/templates/agenda/event_detail.html | 58 ++++++++++--------- 5 files changed, 54 insertions(+), 29 deletions(-) diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss index 710d2887..b4d0c484 100755 --- a/app/static/src/sass/global/_typography.scss +++ b/app/static/src/sass/global/_typography.scss @@ -78,6 +78,14 @@ h3 { .page__block & { @include padding(0 5); + + @include mq($until: md) { + @include padding(0 2.5); + } + + @include mq($until: sm) { + @include padding(0); + } } } diff --git a/app/static/src/sass/modules/_section-title.scss b/app/static/src/sass/modules/_section-title.scss index 63593431..a747fbb5 100644 --- a/app/static/src/sass/modules/_section-title.scss +++ b/app/static/src/sass/modules/_section-title.scss @@ -14,6 +14,17 @@ $module: ".section-title"; @include margin-bottom(4); @include margin-top(5); + @include mq($until: md) { + + @include margin-bottom(1); + @include margin-top(1.25); + + .page__slider & { + @include margin-top(0); + } + + } + i { display: inline-block; @include margin-right(.5); diff --git a/app/static/src/sass/modules/_share-links.scss b/app/static/src/sass/modules/_share-links.scss index e90ffc01..10440153 100644 --- a/app/static/src/sass/modules/_share-links.scss +++ b/app/static/src/sass/modules/_share-links.scss @@ -34,7 +34,7 @@ $module: ".share-links"; @include margin-bottom(.5); color: white; - @include mq($until: sm) { + @include mq($until: md) { display: inline-block; @include margin-right(.5); } diff --git a/app/static/src/sass/modules/boxes/_article-box.scss b/app/static/src/sass/modules/boxes/_article-box.scss index 3b43198f..affa18a1 100644 --- a/app/static/src/sass/modules/boxes/_article-box.scss +++ b/app/static/src/sass/modules/boxes/_article-box.scss @@ -36,6 +36,10 @@ $module: ".article-box"; height: auto; } + @include mq($until: md) { + @include padding(.5); + } + .slider-home & { @include margin(0); max-width: none; diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index d155a6ee..ca456681 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -43,34 +43,36 @@ {% endblock %} {% block page_link %} -
-
- {% if child %} - {% with child.links.all as links %} - {% if links %} -
- {% include 'core/inc/link.html' %} -
- {% endif %} - {% endwith %} - {% else %} - {% with event.links.all as links %} - {% if links %} -
- {% include 'core/inc/link.html' %} -
- {% endif %} - {% endwith %} - {% endif %} - {% if event.mentions %} -
-
- {{ event.mentions }} -
-
- {% endif %} + {% if event.mentions or event.links.all|length > 0 %} +
+
+ {% if child %} + {% with child.links.all as links %} + {% if links %} +
+ {% include 'core/inc/link.html' %} +
+ {% endif %} + {% endwith %} + {% else %} + {% with event.links.all as links %} + {% if links %} +
+ {% include 'core/inc/link.html' %} +
+ {% endif %} + {% endwith %} + {% endif %} + {% if event.mentions %} +
+
+ {{ event.mentions }} +
+
+ {% endif %} +
-
+ {% endif %} {% endblock %} {% block page_audio %} @@ -117,7 +119,7 @@
{% for person in event.persons.all %} {% with person.person as person %} -
+
{% include "network/inc/person/person_card_square.html" %}
{% endwith %} -- 2.39.5