From b08effbe8b69e7a54535013444f0b73deb5d4b60 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Mon, 7 Oct 2019 17:11:35 -0400
Subject: [PATCH] Move layout-related code to separate component files

---
 themes/wporg-5ftf/archive.php                 | 50 +++++++++----------
 .../css/components/_components.scss           |  2 +
 themes/wporg-5ftf/css/components/_page.scss   | 15 ------
 .../css/components/_site-content.scss         | 14 ++++++
 .../css/components/_site-title.scss           | 15 ++++++
 5 files changed, 55 insertions(+), 41 deletions(-)
 create mode 100644 themes/wporg-5ftf/css/components/_site-content.scss
 create mode 100644 themes/wporg-5ftf/css/components/_site-title.scss

diff --git a/themes/wporg-5ftf/archive.php b/themes/wporg-5ftf/archive.php
index 65154db..14b634b 100644
--- a/themes/wporg-5ftf/archive.php
+++ b/themes/wporg-5ftf/archive.php
@@ -10,43 +10,41 @@ if ( ! have_posts() ) {
 
 get_header(); ?>
 
-	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+	<main id="main" class="site-main" role="main">
 
-		<?php if ( have_posts() ) : ?>
-
-			<header class="page-header">
-				<?php
-				the_archive_title( '<h1 class="page-title">', '</h1>' );
-				the_archive_description( '<div class="taxonomy-description">', '</div>' );
-				?>
-			</header><!-- .page-header -->
+	<?php if ( have_posts() ) : ?>
 
+		<header class="page-header">
 			<?php
+			the_archive_title( '<h1 class="page-title">', '</h1>' );
+			the_archive_description( '<div class="taxonomy-description">', '</div>' );
+			?>
+		</header><!-- .page-header -->
 
-			while ( have_posts() ) :
-				the_post();
+		<?php
 
-				/*
-				 * Include the Post-Format-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-				 */
-				get_template_part( 'template-parts/content', 'page' );
+		while ( have_posts() ) :
+			the_post();
 
-			endwhile;
+			/*
+			 * Include the Post-Format-specific template for the content.
+			 * If you want to override this in a child theme, then include a file
+			 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+			 */
+			get_template_part( 'template-parts/content', 'page' );
 
-			the_posts_pagination();
+		endwhile;
 
-		else :
+		the_posts_pagination();
 
-			get_template_part( 'template-parts/content', 'none' );
+	else :
 
-		endif;
-		?>
+		get_template_part( 'template-parts/content', 'none' );
 
-		</main><!-- #main -->
-	</div><!-- #primary -->
+	endif;
+	?>
+
+	</main><!-- #main -->
 
 <?php
 get_footer();
diff --git a/themes/wporg-5ftf/css/components/_components.scss b/themes/wporg-5ftf/css/components/_components.scss
index 5e2185d..407dd03 100644
--- a/themes/wporg-5ftf/css/components/_components.scss
+++ b/themes/wporg-5ftf/css/components/_components.scss
@@ -22,4 +22,6 @@
 @import "about";
 @import "entry-content";
 @import "page";
+@import "site-content";
+@import "site-title";
 @import "wporg-header";
diff --git a/themes/wporg-5ftf/css/components/_page.scss b/themes/wporg-5ftf/css/components/_page.scss
index e08dbb8..95028bd 100644
--- a/themes/wporg-5ftf/css/components/_page.scss
+++ b/themes/wporg-5ftf/css/components/_page.scss
@@ -1,19 +1,4 @@
 body.page:not(.home) {
-	.site-title a {
-		color: #fff;
-		text-decoration: none;
-
-		&:hover,
-		&:active {
-			color: #fff;
-		}
-	}
-
-	.site-main {
-		margin: 0 auto;
-		padding: 0 ms( 2 );
-		max-width: calc( #{ $size__content-width } + #{ ms( 2 ) * 2 } );
-	}
 
 	.entry-header {
 		background: none;
diff --git a/themes/wporg-5ftf/css/components/_site-content.scss b/themes/wporg-5ftf/css/components/_site-content.scss
new file mode 100644
index 0000000..40c8970
--- /dev/null
+++ b/themes/wporg-5ftf/css/components/_site-content.scss
@@ -0,0 +1,14 @@
+.site-content {
+
+	body:not(.home) & {
+		margin: auto;
+		max-width: none;
+		padding: 0;
+
+		.site-main {
+			margin: 0 auto;
+			padding: 0 ms( 2 );
+			max-width: calc( #{ $size__content-width } + #{ ms( 2 ) * 2 } );
+		}
+	}
+}
\ No newline at end of file
diff --git a/themes/wporg-5ftf/css/components/_site-title.scss b/themes/wporg-5ftf/css/components/_site-title.scss
new file mode 100644
index 0000000..b942f72
--- /dev/null
+++ b/themes/wporg-5ftf/css/components/_site-title.scss
@@ -0,0 +1,15 @@
+.site-title {
+
+	body:not(.home) & {
+
+		a {
+			color: #fff;
+			text-decoration: none;
+
+			&:hover,
+			&:active {
+				color: #fff;
+			}
+		}
+	}
+}
\ No newline at end of file