From ffd9d1b070238fb273a1e347b30ff7e415e393f2 Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Mon, 5 Jul 2021 20:59:07 -0400
Subject: [PATCH] Simplify image assigns

---
 _includes/entry.html      | 6 +-----
 _includes/masthead.html   | 6 +-----
 _includes/page-intro.html | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/_includes/entry.html b/_includes/entry.html
index 1d5a4ca..77465ab 100644
--- a/_includes/entry.html
+++ b/_includes/entry.html
@@ -10,11 +10,7 @@
       <a href="{{ post.url | relative_url }}" rel="bookmark">{{ title }}</a>
     </h3>
     {% if post.image.thumbnail %}
-      {% assign entry_image = post.image.thumbnail %}
-      {% unless entry_image contains '://' %}
-        {% assign entry_image = entry_image | relative_url %}
-      {% endunless %}
-      {% assign entry_image = entry_image | escape %}
+      {% assign entry_image = post.image.thumbnail | relative_url | escape %}
       <img class="entry-image u-photo" src="{{ entry_image }}" alt="">
     {% endif %}
   </header>
diff --git a/_includes/masthead.html b/_includes/masthead.html
index 13954b9..ee4dcc0 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -1,8 +1,4 @@
-{% if site.logo contains '://' %}
-  {% assign site_logo = site.logo %}
-{% else %}
-  {% assign site_logo = site.logo | relative_url %}
-{% endif %}
+{% assign site_logo = site.logo | relative_url %}
 
 <header id="masthead">
   <div class="inner">
diff --git a/_includes/page-intro.html b/_includes/page-intro.html
index 4ed2333..e28b0db 100644
--- a/_includes/page-intro.html
+++ b/_includes/page-intro.html
@@ -1,10 +1,6 @@
 <header class="intro">
   {% if page.image %}
-    {% assign intro_image = page.image.path | default: page.image %}
-    {% unless intro_image contains '://' %}
-      {% assign intro_image = intro_image | relative_url %}
-    {% endunless %}
-    {% assign intro_image = intro_image | escape %}
+    {% assign intro_image = page.image.path | default: page.image | relative_url | escape %}
     <div class="intro-image">
       <img src="{{ intro_image }}" alt="{{ page.title }}">
     </div>