rework markup

billerickson · Aug 25, 2017 · ffdb953 · ffdb953
1 parent 24b0f28
commit ffdb953
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 67 deletions.
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/css/main.css.map b/assets/css/main.css.map
diff --git a/assets/scss/partials/_content-area.scss b/assets/scss/partials/_content-area.scss
@@ -1,6 +1,33 @@
 /* Content Area
 ---------------------------------------------------------------------------------------------------- */
 
+.site-inner {
+	padding: 20px 0;
+	@include media(">=medium") {
+		padding: 40px 0;
+	}
+}
+
+/* Single
+--------------------------------------------- */
+
+.layout-standard {
+
+	.site-main {
+		@include make-row;
+
+		.entry-header,
+		.entry-content,
+		.entry-footer,
+		.comments-area,
+		.post-navigation {
+			@include make-sm-column(12);
+			@include make-lg-column(10);
+			@include make-lg-column-offset(1);
+		}
+	}
+}
+
 /* Entries
 --------------------------------------------- */
 

diff --git a/footer.php b/footer.php
@@ -8,6 +8,7 @@
  * @license      GPL-2.0+
 **/
 
+echo '</div>'; // .site-inner
 tha_footer_before();
 echo '<footer class="site-footer" role="contentinfo"><div class="wrap">';
 echo '<div class="row"><div class="col-md-12">';

diff --git a/functions.php b/functions.php
@@ -16,7 +16,6 @@
 require get_template_directory() . '/inc/tha-theme-hooks.php';
 require get_template_directory() . '/inc/wordpress-cleanup.php';
 require get_template_directory() . '/inc/helper-functions.php';
-require get_template_directory() . '/inc/markup.php';
 require get_template_directory() . '/inc/general.php';
 require get_template_directory() . '/inc/navigation.php';
 //require get_template_directory() . '/inc/sidebar-layouts.php';

diff --git a/header.php b/header.php
@@ -38,3 +38,4 @@
 		echo '</div></div>';
 	echo '</div></header>';
 	tha_header_after();
+	echo '<div class="site-inner" id="main-content">';
diff --git a/inc/general.php b/inc/general.php
@@ -19,6 +19,11 @@ function ea_archive_body_classes( $classes ) {
         $classes[] = 'archive';
     }
 
+	// Standard layout (content less wide then header/footer)
+	$standard = apply_filters( 'ea_standard_body_class', is_singular() || is_page() );
+	if( $standard )
+		$classes[] = 'layout-standard';
+
 	return $classes;
 }
 add_filter( 'body_class', 'ea_archive_body_classes' );

diff --git a/inc/markup.php b/inc/markup.php
diff --git a/index.php b/index.php
@@ -12,18 +12,13 @@
 
 tha_content_before();
 
-	$classes = apply_filters( 'ea_site_main_class', array( 'col-md-12' ) );
-	if( !empty( $classes ) )
-		echo '<div class="' . join( ' ', $classes ) . '">';
-
+	echo '<div class="content-area wrap">';
 	echo '<main class="site-main" role="main">';
 	tha_content_top();
 	tha_content_loop();
 	tha_content_bottom();
 	echo '</main>';
-
-	if( !empty( $classes ) )
-		echo '</div>';
+	echo '</div>';
 
 	get_sidebar();