From b6543ef41ed623ec9e9b1feef0f50b9ea36c4db7 Mon Sep 17 00:00:00 2001
From: Maruan Al-Shedivat <alshedivat.maruan@gmail.com>
Date: Sun, 17 May 2020 05:52:09 -0400
Subject: [PATCH] Simplify layout logic

---
 _layouts/about.html | 60 +++++++++++++++++++++++++++------------------
 _layouts/page.html  |  5 ----
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/_layouts/about.html b/_layouts/about.html
index ded8a6c..9ac234e 100644
--- a/_layouts/about.html
+++ b/_layouts/about.html
@@ -1,32 +1,44 @@
 ---
-layout: page
+layout: default
 ---
 
-<div class="row">
-  <div class="col">
-    {{ content }}
-  </div>
-    {% if page.profile %}
-    <div class="profile col-4 {% if page.profile.align == 'left' %}order-first{% endif %}">
-      {% if page.profile.image %}
-        <img class="img-fluid z-depth-1 rounded" src="{{ page.profile.image | prepend: '/assets/img/' | relative_url }}">
-      {% endif %}
-      {% if page.profile.address %}
-        <div class="address">
-          {{ page.profile.address }}
+<div class="post">
+
+  <header class="post-header">
+    {% assign name = site.title | split: ' ' %}
+    <h1 class="post-title"><span class="font-weight-bold">{{ name | first }}</span> {{ name | last }}</h1>
+    <p class="post-description">{{ page.description }}</p>
+  </header>
+
+  <article>
+    <div class="row">
+      <div class="col">
+        {{ content }}
+      </div>
+        {% if page.profile %}
+        <div class="profile col-4 {% if page.profile.align == 'left' %}order-first{% endif %}">
+          {% if page.profile.image %}
+            <img class="img-fluid z-depth-1 rounded" src="{{ page.profile.image | prepend: '/assets/img/' | relative_url }}">
+          {% endif %}
+          {% if page.profile.address %}
+            <div class="address">
+              {{ page.profile.address }}
+            </div>
+          {% endif %}
         </div>
-      {% endif %}
+        {% endif %}
+    </div>
+
+    {% if page.news %}
+      {% include news.html %}
+    {% endif %}
+
+    {% if page.social %}
+    <div class="social">
+      {% include social.html %}
+      <div class="contact-note">{{ site.contact_note }}</div>
     </div>
     {% endif %}
-</div>
+  </article>
 
-{% if page.news %}
-  {% include news.html %}
-{% endif %}
-
-{% if page.social %}
-<div class="social">
-  {% include social.html %}
-  <div class="contact-note">{{ site.contact_note }}</div>
 </div>
-{% endif %}
diff --git a/_layouts/page.html b/_layouts/page.html
index e474e9b..10b9ab4 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -4,12 +4,7 @@ layout: default
 <div class="post">
 
   <header class="post-header">
-    {% if page.title == 'about' %}
-    {% assign name = site.title | split: ' ' %}
-    <h1 class="post-title"><span class="font-weight-bold">{{ name | first }}</span> {{ name | last }}</h1>
-    {% else %}
     <h1 class="post-title">{{ page.title }}</h1>
-    {% endif %}
     <p class="post-description">{{ page.description }}</p>
   </header>