Merge pull request #493 from epfl-si/add-all-events-link

Add "all events" link underneath a list of events
epfl-si · Apr 14, 2021 · b691289 · b691289
2 parents 1140bb0 + b44fd4e
commit b691289
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/assets/components/content-types/event/event-highlight-listing.twig b/assets/components/content-types/event/event-highlight-listing.twig
@@ -1,16 +1,10 @@
-<div class="row align-items-center">
-  <div class="col-md-6">
-    <h2>Les prochains événements</h2>
-  </div>
-  <div class="col-md-6 text-right">
-    <a href="#">Voir tous les événements de la faculté</a>
-  </div>
-</div>
+
+<h2>Les prochains événements</h2>
 <div class="row mt-2">
   <div class="col-md-6">
     {% include '@content-types/event/event-highlight.twig' %}
   </div>
   <div class="col-md-6">
-    {% include '@content-types/event/event-listing.twig' %}
+    {% include '@content-types/event/event-listing.twig' with { bottomlink: true } %}
   </div>
 </div>
diff --git a/assets/components/content-types/event/event-listing.twig b/assets/components/content-types/event/event-listing.twig
@@ -33,9 +33,9 @@
     </a>
   {% endfor %}
 
-  {% if bottomlink %}
+  {% if bottomlink|default(true) %}
     <a href="#" class="list-group-teaser-more">
-      Afficher plus d'événements
+      Voir tous les événements
     </a>
   {% endif %}
 </div>
diff --git a/assets/components/molecules/list-group/list-group.scss b/assets/components/molecules/list-group/list-group.scss
@@ -33,6 +33,10 @@
     &:hover {
       z-index: $zindex-10;
     }
+
+    & + .list-group-teaser {
+      margin-top: -1px;
+    }
   }
 
   .list-group-teaser-thumbnail{