From 856f3f4eb0f68e4239094e0e262f1cff9fe4b690 Mon Sep 17 00:00:00 2001
From: jdelasoie <julien.delasoie@epfl.ch>
Date: Wed, 14 Nov 2018 09:58:32 +0100
Subject: [PATCH 1/4] Fix epfl people design (#145)

* Fix wrong url for default avatar

* Set an empty element if room or function is missing

* Add comment
---
 shortcodes/epfl_people/view.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/shortcodes/epfl_people/view.php b/shortcodes/epfl_people/view.php
index f6a90282..ec295857 100644
--- a/shortcodes/epfl_people/view.php
+++ b/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">

From 88f6207b51139dbe4849a3c5a954b511d9912d2c Mon Sep 17 00:00:00 2001
From: Julien Delasoie <julien.delasoie@epfl.ch>
Date: Wed, 14 Nov 2018 10:47:09 +0100
Subject: [PATCH 2/4] Set default avatar to a better ratio

---
 .../defaults/person-avatar-default-small.png  | Bin 4781 -> 4544 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 assets/images/defaults/person-avatar-default-small.png

diff --git a/assets/images/defaults/person-avatar-default-small.png b/assets/images/defaults/person-avatar-default-small.png
old mode 100644
new mode 100755
index 1ae45fc789fdc781cbf2debaeac0a5a57c25505f..68710bba68a58d01978a4a65fe96bafdfd631967
GIT binary patch
delta 1837
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
WXHGLRx!?kX*jYJQzQI8Klm80@HCk@~

delta 2075
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
FV1gpA!tek9


From d4a28ce69ce37e0110138e8faabf59dd909ce558 Mon Sep 17 00:00:00 2001
From: GregLeBarbar <GregLeBarbar@users.noreply.github.com>
Date: Wed, 14 Nov 2018 16:21:28 +0100
Subject: [PATCH 3/4] fix post teaser (#146)

* fix post teaser

*  === au lieu de ==
---
 shortcodes/post_teaser/view.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shortcodes/post_teaser/view.php b/shortcodes/post_teaser/view.php
index fe5000d2..5f1e8dd9 100644
--- a/shortcodes/post_teaser/view.php
+++ b/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

From c677c3cbbf41d970954f1928585ea0c2f69acf3c Mon Sep 17 00:00:00 2001
From: GregLeBarbar <gregory.charmier.epfl.ch>
Date: Wed, 14 Nov 2018 16:31:15 +0100
Subject: [PATCH 4/4] dump version

---
 CHANGELOG.md | 4 ++++
 VERSION      | 2 +-
 style.css    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 045ef85d..0d0b11d6 100644
--- a/CHANGELOG.md
+++ b/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)
diff --git a/VERSION b/VERSION
index f69752ab..b66183a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.16
+1.2.17
diff --git a/style.css b/style.css
index 3779c956..9f4d5f8a 100644
--- a/style.css
+++ b/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