fix zestedesavoir#3492: Corrige le design des content-item de la home

sandhose · Apr 5, 2016 · 9fe6412 · 9fe6412
1 parent dfea181
commit 9fe6412
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 36 deletions.
diff --git 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
@@ -122,10 +122,11 @@ <h2 class="ico-after ico-tutorials home-heading" itemprop="name">
 
                 <div class="content-item-list">
                     {% 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 %}
                         <p>{% trans "Aucun tutoriel disponible." %}</p>
                     {% endfor %}
+
                     <div class="content-item write-tutorial">
                         <div class="write-tutorial-text">
                             <p>{% blocktrans %}Il y a {{ tutorials_count }} tutoriels sur Zeste de Savoir.{% endblocktrans %}</p>

diff --git 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 %} <a href="{% url 'content:list' %}?category={{ category.slug }}">{{ category.title }}</a>{% endfor %}
 {% endcaptureas %}
 
-<article class="content-item has-reactions">
+<article class="content-item has-reactions{{ item_class }}">
     <a href="{{ link }}" tabindex="-1" class="content-illu">
         {% if content.image %}
             <img src="{{ content.image.physical.content_thumb.url }}" alt="">

diff --git a/zds/settings.py b/zds/settings.py
@@ -473,7 +473,7 @@
         'repo_path': os.path.join(BASE_DIR, 'tutoriels-private'),
         'repo_public_path': os.path.join(BASE_DIR, 'tutoriels-public'),
         'default_license_pk': 7,
-        'home_number': 5,
+        'home_number': 3,
         'helps_per_page': 20,
         'content_per_page': 42,
         'feed_length': 5,