Merge branch 'release/1.2.4'

epfl-si · Aug 30, 2018 · b3758e4 · b3758e4
2 parents c24dcd4 + 7f67423
commit b3758e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 
 # CHANGELOG
 
+*1.2.4* (2018-08-30)
+  - remove top padding on homepage
+  - hotfix overflow hidden events 
+
 *1.2.3* (2018-08-30)
   - epfl-news: fix big image for news shortcode
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.3
+1.2.4
diff --git a/shortcodes/epfl_memento/view.php b/shortcodes/epfl_memento/view.php
@@ -6,8 +6,8 @@
   $display_first_event = ('1' === $template);
 ?>
 
-<div class="container-full">
-  <div class="container overflow-hidden">
+<div class="container-full overflow-hidden">
+  <div class="container">
     <div class="card-slider-wrapper">
       <div class="card-slider">
 

diff --git 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.3
+Version: 1.2.4
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl

diff --git a/template-parts/content-page.php b/template-parts/content-page.php
@@ -23,7 +23,7 @@
 		<?php endif ?>
 
 		<?php
-		$content_spacing_classes = $has_hero ? 'pb-5 mb-4 ' : 'py-5 mb-4 '; ?>
+		$content_spacing_classes = $has_hero || $currentTemplate == 'page-homepage.php' ? 'pb-5 mb-4 ' : 'py-5 mb-4 '; ?>
 
 		<div class="entry-content container-grid <?php echo $content_spacing_classes; ?>">
 			<?php