Hotfix/hotfix 030119 general cleanup

assets/sass/modules/content-blocks/_carousel.scss

@@ -4,6 +4,11 @@
 $slide-height: rem(500);
 
 .carousel-block {
+
+	// Removes padding.
+	&.content-block {
+		@include padding(0 null);
+	} // &.content-block
 
 	// Arbitrary <div> inserted by Slick.
 	.slick-slide div {

assets/sass/modules/content-blocks/_global.scss

@@ -2,7 +2,7 @@
 // Global Content Block Styles
 //--------------------------------------------------------------
 .content-block {
-	@include margin(null null $gutter * 2 null);
+	@include padding($gutter * 2 null);
 
 	// Content Block titles.
 	&-title {
@@ -14,9 +14,10 @@
 	} // .content-block-title
 
 	&.has-background {
-		@include padding($gutter * 2 null);
+		@include margin(0 auto);
 
 		&.container-width {
+			@include margin($gutter * 2 auto);
 			@include padding($gutter * 2 0);
 
 			@include media($container-offset) {
@@ -25,6 +26,18 @@
 		} // &.container-width.
 	} // &.has-background
 
+	// Remove the extra padding on nested no-background blocks.
+	&.no-background,
+	&.no-background.container-width,
+	&.has-background.container-width {
+
+		// Remove padding from nth no-background block.
+		& + .no-background,
+		& + .no-background.container-width {
+			padding-top: 0;
+		} // & + .no-background
+	} // &.no-background
+
 	// Make sure videos stay in their containers.
 	&.video-as-background {
 		overflow: hidden;

assets/sass/modules/content-blocks/_posts.scss

@@ -0,0 +1,12 @@
+//--------------------------------------------------------------
+// Related and Recent Posts Blocks
+//--------------------------------------------------------------
+
+
+//-----------------------------------------
+// Shared
+//-----------------------------------------
+.recent-posts-block,
+.related-posts-block {
+	padding-bottom: 0;
+} // .recent-posts-block, .related-posts-block

assets/sass/modules/content-blocks/index.scss

@@ -2,8 +2,9 @@
 // ACF Content Blocks
 //--------------------------------------------------------------
 
+@import 'accordion';
 @import 'call-to-action';
+@import 'carousel';
 @import 'global';
 @import 'hero';
-@import 'carousel';
-@import 'accordion';
+@import 'posts';

assets/sass/structure/_layout.scss

@@ -19,6 +19,10 @@
 		@include margin($gutter * 2 auto);
 
 		max-width: $container;
+
+		&.container-width {
+			@include margin(0 auto);
+		} // &.container-width
 	} // > *:not(.full-width)
 
 	// Post elements.

inc/acf.php

@@ -405,3 +405,24 @@ function _s_get_theme_colors() {
 		esc_html__( 'Whitesmoke', '_s' )     => '#f1f1f1',
 	);
 }
+
+/**
+ * Adds h1 or h2 heading for hero based on location.
+ *
+ * @param string $title acf value.
+ * @author jomurgel <jo@webdevstudios.com>
+ * @return void
+ */
+function _s_display_hero_heading( $title ) {
+
+	// Bail if our title is empty.
+	if ( empty( $title ) ) {
+		return;
+	}
+
+	// Set hero title to h1 if it's the first block not on the homepage.
+	$index   = get_row_index();
+	$heading = 1 === $index && ! ( is_front_page() && is_home() ) ? 'h1' : 'h2';
+
+	echo sprintf( '<%1$s class="hero-title">%2$s</%1$s>', esc_attr( $heading ), esc_html( $title ) );
+}