Merge branch 'release/1.1.1'

epfl-si · Aug 13, 2018 · d2d2e65 · d2d2e65
2 parents 3addac4 + d3ab085
commit d2d2e65
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 
 # CHANGELOG
 
+*1.1.1* (2018-08-13)
+  - implement styleguide version (1.1.1)
+  - fix main nav on post detail page
+  - put breadcrumb inside a ul tag for semantics
+  - hotfix php 7.2 error with sozeof and strings
+
 *1.1.0* (2018-08-10)
   - implement styleguide version (1.1.0)
   - implement new verison of the main nav

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/assets/css/base.css b/assets/css/base.css
diff --git a/page.php b/page.php
@@ -23,9 +23,9 @@
 			endwhile; // End of the loop.
 			?>
 		</main><!-- #main -->
-	</div>
+	</div> <!-- w-100 -->
 	<?php get_sidebar(); ?>
-</div>
+</div> <!-- nav-toggle-layout -->
 
 </div> <!-- main-container -->
 

diff --git a/shortcodes/definition_list/view.php b/shortcodes/definition_list/view.php
@@ -17,7 +17,7 @@
       continue;
     }
 
-    if (sizeof($value) === 0) {
+    if (strlen($value) === 0) {
       $skipNext = true;
       continue;
     }

diff --git a/sidebar.php b/sidebar.php
@@ -16,7 +16,8 @@
 
 // to display correctly the menu on level 1 pages, we need to add '.current-menu-parent' to the wrapper
 $classes = '';
-if ( $item->post_parent === 0 ) $classes = 'current-menu-parent';
+if ( $item->post_parent === 0 || $item === false ) $classes = 'current-menu-parent';
+
 ?>
 <div class="overlay"></div>
 <nav class="nav-main">

diff --git a/single.php b/single.php
@@ -9,20 +9,32 @@
 
 init_globals();
 get_header();
-get_sidebar();
+
+global $containerClasses;
+
+if (!is_front_page()) {
+	get_template_part( 'template-parts/breadcrumb');
+}
 ?>
 
-<main id="content" role="main" class="content pt-5">
-		<?php
-		while ( have_posts() ) :
-			the_post();
+	<div class="<?php echo $containerClasses ?>">
+		<div class="w-100">
+			<main id="content" role="main" class="content pt-5">
+				<?php
+			while ( have_posts() ) :
+				the_post();
+
+				get_template_part( 'template-parts/content', get_post_type() );
+
+			endwhile; // End of the loop.
+			?>
+			</main>
+		</div> <!-- w-100 -->
 
-			get_template_part( 'template-parts/content', get_post_type() );
+		<?php get_sidebar(); ?>
+	</div> <!-- nav-toggle-layout -->
 
-		endwhile; // End of the loop.
-		?>
-</main>
+	</div> <!-- main-container -->
 
 <?php
-get_sidebar();
-get_footer();
+get_footer();
diff --git a/template-parts/breadcrumb.php b/template-parts/breadcrumb.php
@@ -33,7 +33,7 @@
     _wp_menu_item_classes_by_context( $items ); // Set up the class variables, including current-classes
     $crumbs = array();
 
-    echo '<nav aria-label="breadcrumb" class="breadcrumb-wrapper" id="breadcrumb-wrapper">';
+    echo '<nav aria-label="breadcrumb" class="breadcrumb-wrapper" id="breadcrumb-wrapper"><ul class="p-0 m-0">';
     $crumbs[] = '
         <li class="breadcrumb-item">
             <a class="bread-link bread-home" href="' . get_home_url() . '" title="home">
@@ -57,7 +57,7 @@
         }
     }
     echo implode('', $crumbs);
-    echo '</nav>';
+    echo '</ul></nav>';
   ?>
   <!-- end Breadcrumb -->
 </div>
diff --git a/template-parts/content-post.php b/template-parts/content-post.php
@@ -52,10 +52,4 @@
 		) );
 		?>
 	</div><!-- .entry-content -->
-
-	<!-- 
-	<footer class="entry-footer">
-		<?php epfl_entry_footer(); ?>
-	</footer><!-- .entry-footer 
-	-->
 </article><!-- #post-<?php the_ID(); ?> -->