From 9fe6412360dcae3496bc7a1fbe66f9eeb6a7cf81 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Tue, 5 Apr 2016 00:17:24 +0200 Subject: [PATCH] fix #3492: Corrige le design des content-item de la home --- assets/scss/components/_content-item.scss | 35 ++----------------- templates/home.html | 3 +- .../includes/content_item.part.html | 2 +- zds/settings.py | 2 +- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/assets/scss/components/_content-item.scss b/assets/scss/components/_content-item.scss index 00907457cc..7d42d6b1b4 100644 --- a/assets/scss/components/_content-item.scss +++ b/assets/scss/components/_content-item.scss @@ -150,6 +150,7 @@ $content-reaction-offset: -14px; // -30px to not offset the meta font-size: 15px; font-size: 1.5rem; line-height: 26px; + height: 26px; color: #999; margin-bottom: 2px; @@ -179,7 +180,7 @@ $content-reaction-offset: -14px; // -30px to not offset the meta display: none; } - & > a { + & a { color: darken($color-secondary, 10%); &:hover, &:focus { @@ -305,38 +306,6 @@ $content-reaction-offset: -14px; // -30px to not offset the meta } } -@media only screen and #{$media-wide} { - .content-item { - &.mini { - flex-basis: 200px; - .content-description { - display: none; - } - - .content-title { - white-space: normal; - font-size: 14px; - line-height: 15px; - height: 45px; // 3 lines - } - - .content-meta { - padding-top: 1px; - - &:not(.inline) { - .content-pubdate { - display: none; - } - - & > * { - display: block; - } - } - } - } - } -} - @media only screen and #{$media-mobile-tablet} { .full-content-wrapper .content-item { .content-info { diff --git a/templates/home.html b/templates/home.html index 76207df9ff..aa5637501b 100644 --- a/templates/home.html +++ b/templates/home.html @@ -122,10 +122,11 @@

{% for tutorial in last_tutorials %} - {% include 'tutorialv2/includes/content_item.part.html' with public_content=tutorial show_description=True item_class=forloop.first|yesno:", mini" %} + {% include 'tutorialv2/includes/content_item.part.html' with public_content=tutorial show_description=True %} {% empty %}

{% trans "Aucun tutoriel disponible." %}

{% endfor %} +

{% blocktrans %}Il y a {{ tutorials_count }} tutoriels sur Zeste de Savoir.{% endblocktrans %}

diff --git a/templates/tutorialv2/includes/content_item.part.html b/templates/tutorialv2/includes/content_item.part.html index 11bffa54e8..a207ada527 100644 --- a/templates/tutorialv2/includes/content_item.part.html +++ b/templates/tutorialv2/includes/content_item.part.html @@ -48,7 +48,7 @@ {% for category in content.subcategory.all %}{% if forloop.first %}{% trans "dans" %}{% elif forloop.last %} {% trans "et" %}{% else %},{% endif %} {{ category.title }}{% endfor %} {% endcaptureas %} -