From f743e50f6319c3d399a5d77d9f2cb7c56f3773f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Wed, 8 Feb 2017 13:21:45 +0100 Subject: [PATCH] Update event details page --- app/static/src/sass/global/_wysiwyg.scss | 2 +- app/static/src/sass/modules/_page.scss | 2 +- .../src/sass/modules/_section-title.scss | 17 +++++++++++++ .../sass/modules/boxes/_event-line-box.scss | 1 + app/templates/agenda/event_detail.html | 25 ++----------------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/static/src/sass/global/_wysiwyg.scss b/app/static/src/sass/global/_wysiwyg.scss index ab8705a0..ebb0bb89 100644 --- a/app/static/src/sass/global/_wysiwyg.scss +++ b/app/static/src/sass/global/_wysiwyg.scss @@ -166,7 +166,7 @@ @include padding-left(1); @include margin-top(1.5); - border-left: 1px solid $color-black; + border-left: 1px solid $color-main; & + .wys-highlighted-paragraph { diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss index b99f1da0..f2c5736c 100644 --- a/app/static/src/sass/modules/_page.scss +++ b/app/static/src/sass/modules/_page.scss @@ -23,7 +23,7 @@ $module: ".page"; #{$module} { min-height: 500px; - @include margin-top(5); + @include margin-top(3); @include mq($until: sm) { min-height: 0; diff --git a/app/static/src/sass/modules/_section-title.scss b/app/static/src/sass/modules/_section-title.scss index 4c59094d..fddf203d 100644 --- a/app/static/src/sass/modules/_section-title.scss +++ b/app/static/src/sass/modules/_section-title.scss @@ -14,6 +14,23 @@ $module: ".section-title"; @include margin-bottom(4); @include margin-top(0); + i { + display: inline-block; + @include margin-right(.5); + @include transition(all 0.5s ease-in-out); + } + + a { + color: inherit; + @include transition(all 0.5s ease-in-out); + &:hover { + color: $color-main; + i { + @include transform(translateX(-50%)); + } + } + } + &--uppercase { text-transform: uppercase; } diff --git a/app/static/src/sass/modules/boxes/_event-line-box.scss b/app/static/src/sass/modules/boxes/_event-line-box.scss index 6eb2c5cd..e17a6476 100644 --- a/app/static/src/sass/modules/boxes/_event-line-box.scss +++ b/app/static/src/sass/modules/boxes/_event-line-box.scss @@ -68,6 +68,7 @@ $module: ".event-line-box"; left: 0; height: 100%; width: 100%; + text-align: left; @include mq($until: sm) { position: static; diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index f6cb62e2..df4d6e40 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -20,29 +20,8 @@ {% endblock %} {% block page_title %} - {% editable event.title %} -

{{ event.title }}

- {% endeditable %} - {% if event.sub_title %} - {% editable event.sub_title %} -
- {{ event.sub_title }} -
- {% endeditable %} - {% endif %} -{% endblock %} - -{% block page_tags %} - {% if event.departments.all.0 %} -
- {{ event.departments.all.0.department.name }} -
- {% endif %} - {% if event.category %} -
- {{ event.category }} -
- {% endif %} +

{% trans "Back to events" %}

+ {% include 'agenda/includes/event_linecard.html' %} {% endblock %} {% block breadcrumb_menu %} -- 2.39.5