Merge pull request #1149 from colin-marshall/update-full-width-class

Change the full-width template class to .main-content-full-width
olefredrik · Nov 9, 2017 · 04d0de1 · 04d0de1
2 parents d125515 + 6adaa28
commit 04d0de1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/page-templates/page-full-width.php b/page-templates/page-full-width.php
@@ -6,8 +6,8 @@
 
 <?php get_template_part( 'template-parts/featured-image' ); ?>
 
-<div class="main-wrap full-width">
-	<main class="main-content">
+<div class="main-wrap">
+	<main class="main-content-full-width">
 		<?php while ( have_posts() ) : the_post(); ?>
 			<?php get_template_part( 'template-parts/content', 'page' ); ?>
 			<?php comments_template(); ?>

diff --git a/src/assets/scss/modules/_content.scss b/src/assets/scss/modules/_content.scss
@@ -8,42 +8,36 @@
   }
 
   &.sidebar-left {
-
     // Place the sidebar below main content on small screens ...
-      @include breakpoint(small) {
-        .main-content { order: 1; }
-        .sidebar { order: 2; }
-      }
+    @include breakpoint(small) {
+      .main-content { order: 1; }
+      .sidebar { order: 2; }
+    }
 
     // ... and to the left on medium-up screens, when using the sidebar-left template
-      @include breakpoint(medium) {
-        .main-content { order: 2; }
-        .sidebar { order: 1; }
-      }
+    @include breakpoint(medium) {
+      .main-content { order: 2; }
+      .sidebar { order: 1; }
+    }
   }
 
   // Full width template
-  &.full-width {
-    .main-content {
-      @include xy-cell(12);
-    }
+  .main-content-full-width {
+    @include xy-cell(12);
   }
 
+  // Default template
   .main-content {
-
-    // Default template
     @include breakpoint(small) {
       @include xy-cell(12);
     }
 
     @include breakpoint(medium) {
       @include xy-cell(8);
     }
-
   }
 
   .sidebar {
-
     @include breakpoint(small) {
       @include xy-cell(12);
     }