From c0f97d25d0071ca962600f92903b9eb64de9e388 Mon Sep 17 00:00:00 2001
From: Peter Ahrens <ptrahrens@gmail.com>
Date: Thu, 1 Feb 2018 23:09:21 -0500
Subject: [PATCH 1/2] This commit should add a new layout called "queen," a
 bigger version of the "single" layout that puts the right sidebar on top.

---
 _layouts/queen.html                  | 95 ++++++++++++++++++++++++++++
 _sass/minimal-mistakes/_page.scss    | 20 ++++++
 _sass/minimal-mistakes/_sidebar.scss | 18 ++++++
 3 files changed, 133 insertions(+)
 create mode 100644 _layouts/queen.html

diff --git a/_layouts/queen.html b/_layouts/queen.html
new file mode 100644
index 000000000000..29df38d04adb
--- /dev/null
+++ b/_layouts/queen.html
@@ -0,0 +1,95 @@
+---
+layout: default
+---
+
+{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+  {% include page__hero.html %}
+{% elsif page.header.video.id and page.header.video.provider %}
+  {% include page__hero_video.html %}
+{% endif %}
+
+{% if page.url != "/" and site.breadcrumbs %}
+  {% unless paginator %}
+    {% include breadcrumbs.html %}
+  {% endunless %}
+{% endif %}
+
+<div id="main" role="main">
+  {% include sidebar.html %}
+
+  {% comment %}<!-- this page is bigger than a single mattress, it's a queen! -->{% endcomment %}
+  <div class="queen">
+    <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
+      {% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
+      {% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
+      {% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date: "%B %d, %Y" }}">{% endif %}
+      {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}
+
+      <div class="page__inner-wrap">
+        {% unless page.header.overlay_color or page.header.overlay_image %}
+          <header>
+            {% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
+            {% if page.read_time %}
+              <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
+            {% endif %}
+          </header>
+        {% endunless %}
+
+        <section class="page__content" itemprop="text">
+          {% if page.toc %}
+            <aside class="sidebar__right">
+              <nav class="toc">
+                <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label }}</h4></header>
+                {% include toc.html sanitize=true html=content h_min=2 h_max=3 class="toc__menu" %}
+              </nav>
+            </aside>
+          {% endif %}
+          {{ content }}
+          {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
+        </section>
+
+        <footer class="page__meta">
+          {% if site.data.ui-text[site.locale].meta_label %}
+            <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
+          {% endif %}
+          {% include page__taxonomy.html %}
+          {% if page.last_modified_at %}
+            <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.last_modified_at | date: "%Y-%m-%d" }}">{{ page.last_modified_at | date: "%B %d, %Y" }}</time></p>
+          {% elsif page.date %}
+            <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
+          {% endif %}
+        </footer>
+
+        {% if page.share %}{% include social-share.html %}{% endif %}
+
+        {% include post_pagination.html %}
+      </div>
+
+      {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
+        {% include comments.html %}
+      {% endif %}
+    </article>
+
+    {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
+    {% if page.id and page.related and site.related_posts.size > 0 %}
+      <div class="page__related">
+        <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+        <div class="grid__wrapper">
+          {% for post in site.related_posts limit:4 %}
+            {% include archive-single.html type="grid" %}
+          {% endfor %}
+        </div>
+      </div>
+    {% comment %}<!-- otherwise show recent posts if no related when `related: true` -->{% endcomment %}
+    {% elsif page.id and page.related %}
+      <div class="page__related">
+        <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+        <div class="grid__wrapper">
+          {% for post in site.posts limit:4 %}
+            {% include archive-single.html type="grid" %}
+          {% endfor %}
+        </div>
+      </div>
+    {% endif %}
+  </div>
+</div>
diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss
index 600f076828d4..d0428006742e 100644
--- a/_sass/minimal-mistakes/_page.scss
+++ b/_sass/minimal-mistakes/_page.scss
@@ -52,6 +52,16 @@
   }
 }
 
+.queen .page {
+  @include breakpoint($large) {
+    padding-right: 0;
+  }
+
+  @include breakpoint($x-large) {
+    padding-right: 0;
+  }
+}
+
 .page__title {
   margin-top: 0;
   line-height: 1;
@@ -419,6 +429,16 @@
   }
 }
 
+.queen .page__related {
+  @include breakpoint($large) {
+    padding-right: 0;
+  }
+
+  @include breakpoint($x-large) {
+    padding-right: 0;
+  }
+}
+
 .page__related-title {
   margin-bottom: 10px;
   font-size: $type-size-6;
diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss
index aebb0e880363..151a8ea6c801 100644
--- a/_sass/minimal-mistakes/_sidebar.scss
+++ b/_sass/minimal-mistakes/_sidebar.scss
@@ -94,6 +94,24 @@
   }
 }
 
+.queen .sidebar__right {
+  margin-bottom: 1em;
+  @include breakpoint($large) {
+    position: initial;
+    top: initial;
+    right: initial;
+    width: initial;
+    margin-right: initial;
+    padding-left: initial;
+    z-index: initial;
+  }
+
+  @include breakpoint($x-large) {
+    width: initial;
+    margin-right: initial;
+  }
+}
+
 /*
    Author profile and links
    ========================================================================== */

From c95473a94b4b1262abb70bd1e52edec3fe7008fd Mon Sep 17 00:00:00 2001
From: Peter Ahrens <ptrahrens@gmail.com>
Date: Fri, 2 Feb 2018 09:18:39 -0500
Subject: [PATCH 2/2] Taking the more elegant approach

---
 _layouts/queen.html                  | 95 ----------------------------
 _sass/minimal-mistakes/_page.scss    | 46 ++++++++------
 _sass/minimal-mistakes/_sidebar.scss | 41 ++++++------
 3 files changed, 49 insertions(+), 133 deletions(-)
 delete mode 100644 _layouts/queen.html

diff --git a/_layouts/queen.html b/_layouts/queen.html
deleted file mode 100644
index 29df38d04adb..000000000000
--- a/_layouts/queen.html
+++ /dev/null
@@ -1,95 +0,0 @@
----
-layout: default
----
-
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
-  {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
-  {% include page__hero_video.html %}
-{% endif %}
-
-{% if page.url != "/" and site.breadcrumbs %}
-  {% unless paginator %}
-    {% include breadcrumbs.html %}
-  {% endunless %}
-{% endif %}
-
-<div id="main" role="main">
-  {% include sidebar.html %}
-
-  {% comment %}<!-- this page is bigger than a single mattress, it's a queen! -->{% endcomment %}
-  <div class="queen">
-    <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
-      {% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
-      {% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
-      {% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date: "%B %d, %Y" }}">{% endif %}
-      {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}
-
-      <div class="page__inner-wrap">
-        {% unless page.header.overlay_color or page.header.overlay_image %}
-          <header>
-            {% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
-            {% if page.read_time %}
-              <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
-            {% endif %}
-          </header>
-        {% endunless %}
-
-        <section class="page__content" itemprop="text">
-          {% if page.toc %}
-            <aside class="sidebar__right">
-              <nav class="toc">
-                <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label }}</h4></header>
-                {% include toc.html sanitize=true html=content h_min=2 h_max=3 class="toc__menu" %}
-              </nav>
-            </aside>
-          {% endif %}
-          {{ content }}
-          {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
-        </section>
-
-        <footer class="page__meta">
-          {% if site.data.ui-text[site.locale].meta_label %}
-            <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
-          {% endif %}
-          {% include page__taxonomy.html %}
-          {% if page.last_modified_at %}
-            <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.last_modified_at | date: "%Y-%m-%d" }}">{{ page.last_modified_at | date: "%B %d, %Y" }}</time></p>
-          {% elsif page.date %}
-            <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
-          {% endif %}
-        </footer>
-
-        {% if page.share %}{% include social-share.html %}{% endif %}
-
-        {% include post_pagination.html %}
-      </div>
-
-      {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
-        {% include comments.html %}
-      {% endif %}
-    </article>
-
-    {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
-    {% if page.id and page.related and site.related_posts.size > 0 %}
-      <div class="page__related">
-        <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
-        <div class="grid__wrapper">
-          {% for post in site.related_posts limit:4 %}
-            {% include archive-single.html type="grid" %}
-          {% endfor %}
-        </div>
-      </div>
-    {% comment %}<!-- otherwise show recent posts if no related when `related: true` -->{% endcomment %}
-    {% elsif page.id and page.related %}
-      <div class="page__related">
-        <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
-        <div class="grid__wrapper">
-          {% for post in site.posts limit:4 %}
-            {% include archive-single.html type="grid" %}
-          {% endfor %}
-        </div>
-      </div>
-    {% endif %}
-  </div>
-</div>
diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss
index d0428006742e..c5c1f38060a0 100644
--- a/_sass/minimal-mistakes/_page.scss
+++ b/_sass/minimal-mistakes/_page.scss
@@ -52,16 +52,6 @@
   }
 }
 
-.queen .page {
-  @include breakpoint($large) {
-    padding-right: 0;
-  }
-
-  @include breakpoint($x-large) {
-    padding-right: 0;
-  }
-}
-
 .page__title {
   margin-top: 0;
   line-height: 1;
@@ -429,18 +419,34 @@
   }
 }
 
-.queen .page__related {
-  @include breakpoint($large) {
-    padding-right: 0;
-  }
-
-  @include breakpoint($x-large) {
-    padding-right: 0;
-  }
-}
-
 .page__related-title {
   margin-bottom: 10px;
   font-size: $type-size-6;
   text-transform: uppercase;
 }
+
+/*
+   Wide Pages
+   ========================================================================== */
+
+.wide {
+  .page {
+    @include breakpoint($large) {
+      padding-right: 0;
+    }
+
+    @include breakpoint($x-large) {
+      padding-right: 0;
+    }
+  }
+
+  .page__related {
+    @include breakpoint($large) {
+      padding-right: 0;
+    }
+
+    @include breakpoint($x-large) {
+      padding-right: 0;
+    }
+  }
+}
diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss
index 151a8ea6c801..808324cc69f1 100644
--- a/_sass/minimal-mistakes/_sidebar.scss
+++ b/_sass/minimal-mistakes/_sidebar.scss
@@ -94,24 +94,6 @@
   }
 }
 
-.queen .sidebar__right {
-  margin-bottom: 1em;
-  @include breakpoint($large) {
-    position: initial;
-    top: initial;
-    right: initial;
-    width: initial;
-    margin-right: initial;
-    padding-left: initial;
-    z-index: initial;
-  }
-
-  @include breakpoint($x-large) {
-    width: initial;
-    margin-right: initial;
-  }
-}
-
 /*
    Author profile and links
    ========================================================================== */
@@ -290,3 +272,26 @@
     }
   }
 }
+
+/*
+   Wide Pages
+   ========================================================================== */
+
+.wide .sidebar__right {
+  margin-bottom: 1em;
+  @include breakpoint($large) {
+    position: initial;
+    top: initial;
+    right: initial;
+    width: initial;
+    margin-right: initial;
+    padding-left: initial;
+    z-index: initial;
+  }
+
+  @include breakpoint($x-large) {
+    width: initial;
+    margin-right: initial;
+  }
+}
+