Merge branch 'release/1.2.17'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+*1.2.17* (2018-11-14)
+  - Fix post teaser gray background (#146)
+  - Fix epfl people design (#145) 
+
 *1.2.16* (2018-11-14)
   - epfl_social_feed: simplify renderer to align the feed in center (#144)
   - epfl_card: set full container in all case; allow to add a gray wrapper (#143)

VERSION

@@ -1 +1 @@
-1.2.16
+1.2.17

shortcodes/epfl_people/view.php

@@ -49,17 +49,25 @@
         <div class="card-body">
           <div class="my-3 align-items-center">
             <?php /* this inline style can be removed next time we apply a new Styleguide version */ ?>
-            <img style="height:8rem;" class="img-fluid rounded-circle mb-2 person-card-avatar" src="<?php echo ($photo_url ? esc_url($photo_url) : bloginfo('template_url').'/images/defaults/person-default-avatar-small.png') ?>" alt="<?php echo esc_attr($person->prenom) ?> <?php echo esc_attr($person->nom) ?>">
+            <img style="height:8rem;" class="img-fluid rounded-circle mb-2 person-card-avatar" src="<?php echo ($photo_url ? esc_url($photo_url) : bloginfo('template_url').'/assets/images/defaults/person-avatar-default-small.png') ?>" alt="<?php echo esc_attr($person->prenom) ?> <?php echo esc_attr($person->nom) ?>">
           </div>
           <h3><a class="link-pretty" href="<?php echo esc_url($people_url) ?>"><?php echo esc_html($person->prenom) ?> <?php echo esc_html($person->nom) ?></a></h3>
           <dl class="definition-list definition-list-grid mb-0">
             <?php if ($functions[0]): ?>
             <dt><?php esc_html_e('Position', 'epfl') ?></dt>
             <dd><?php echo esc_html($functions[0]) ?></dd>
+            <?php else: ?>
+            <?php /* Quickfix until fixed in Styleguide */ ?>
+            <dt></dt>
+            <dd>&nbsp;</dd>
             <?php endif; ?>
             <?php if ($rooms[0]): ?>
             <dt><?php esc_html_e('Office', 'epfl') ?></dt>
             <dd><a class="link-pretty" href="<?php echo esc_url($room_url) ?>"><?php echo esc_html($rooms[0]) ?></a></dd>
+            <?php else: ?>
+            <?php /* Quickfix until fixed in Styleguide */ ?>
+            <dt></dt>
+            <dd>&nbsp;</dd>
             <?php endif; ?>
           </dl>
           <div class="w-100 mt-2 mt-md-0">

shortcodes/post_teaser/view.php

@@ -9,7 +9,9 @@
   <div class="container-full my-3<?php echo $gray ? ' bg-gray-100' : '' ?>">
     <div class="container">
       <div class="card-deck<?php echo ($postCount < 3) ? ' card-deck-line' : '' ?>">
-        <?php foreach($data as $key => $post) : ?>
+        <?php foreach($data as $key => $post) :
+            if ($key === 'gray') continue;
+        ?>
         <?php  $post_url = get_permalink($post); ?>
         <a href="<?php echo $post_url ?>" class="card link-trapeze-horizontal">
           <?php

style.css

@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.2.16
+Version: 1.2.17
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl