From: Jérémy Fabre Date: Tue, 14 Feb 2017 16:15:56 +0000 (+0100) Subject: Fix event line box and h3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6de36beb9d223f9b47cf3dbbc4b8d804d9bd8ab1;p=mezzo.git Fix event line box and h3 --- diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss index 7f946e14..cfe15e68 100755 --- a/app/static/src/sass/global/_typography.scss +++ b/app/static/src/sass/global/_typography.scss @@ -74,7 +74,7 @@ h3 { .page__content &, .page__block & { text-transform: uppercase; line-height: 2rem; - @include padding(0 5); + @include margin(0 5); } } 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 db0fae7e..518104aa 100644 --- a/app/static/src/sass/modules/boxes/_event-line-box.scss +++ b/app/static/src/sass/modules/boxes/_event-line-box.scss @@ -202,7 +202,7 @@ $module: ".event-line-box"; color: $color-main; - margin: 0; + margin: 0 !important; a:not(.button) { diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html index 648b5d12..b8bad92b 100644 --- a/app/templates/agenda/includes/event_linecard.html +++ b/app/templates/agenda/includes/event_linecard.html @@ -63,9 +63,9 @@ {% endif %} {% endif %} -

+
{{ event.title }} -

+
{% include 'agenda/includes/event_date_line.html' with object=event %}