diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index b7d62149927c..cff677027b31 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -5,18 +5,10 @@
{% if author.avatar %}
{%- for link in site.data.navigation.main -%}
- {%- if link.url contains '://' -%}
- {%- assign url = link.url -%}
- {%- else -%}
- {%- assign url = link.url | relative_url -%}
- {%- endif -%}
diff --git a/_includes/nav_list b/_includes/nav_list
index b1d06c304b7a..8f2d19d33433 100644
--- a/_includes/nav_list
+++ b/_includes/nav_list
@@ -9,11 +9,7 @@
{%- endfor -%}
diff --git a/_includes/figure b/_includes/figure
index 8e9bdd581d69..f1ce1ebcc110 100644
--- a/_includes/figure
+++ b/_includes/figure
@@ -1,12 +1,9 @@
+
+ {% endif %}
+
diff --git a/_includes/gallery b/_includes/gallery
index 97022aa881da..71a9e1e1b3d1 100644
--- a/_includes/gallery
+++ b/_includes/gallery
@@ -19,33 +19,17 @@
\ No newline at end of file
+
diff --git a/_includes/head.html b/_includes/head.html
index 8963379aa033..fb1e5dce52e8 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -31,11 +31,6 @@
{% if site.head_scripts %}
{% for script in site.head_scripts %}
- {% if script contains "://" %}
- {% capture script_path %}{{ script }}{% endcapture %}
- {% else %}
- {% capture script_path %}{{ script | relative_url }}{% endcapture %}
- {% endif %}
-
+
{% endfor %}
{% endif %}
diff --git a/_includes/masthead.html b/_includes/masthead.html
index 28fb6fe2fe00..47cce0a3545e 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -13,13 +13,8 @@
-
{% for child in nav.children %}
{% comment %} internal/external URL check {% endcomment %}
- {% if child.url contains "://" %}
- {% assign child_url = child.url %}
- {% else %}
- {% assign child_url = child.url | relative_url %}
- {% endif %}
+ {% assign child_url = child.url | relative_url %}
{% comment %} set "active" class on current page {% endcomment %}
{% if child.url == page.url %}
@@ -44,4 +36,4 @@
{% if page.header.actions %}
{% for action in page.header.actions %} - {% if action.url contains "://" %} - {% assign url = action.url %} - {% else %} - {% assign url = action.url | relative_url %} - {% endif %} - {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} + {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} {% endfor %} {% endif %} diff --git a/_includes/scripts.html b/_includes/scripts.html index 5530028ef866..806bbc16baf2 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,11 +1,6 @@ {% if site.footer_scripts %} {% for script in site.footer_scripts %} - {% if script contains "://" %} - {% capture script_path %}{{ script }}{% endcapture %} - {% else %} - {% capture script_path %}{{ script | relative_url }}{% endcapture %} - {% endif %} - + {% endfor %} {% else %} @@ -29,11 +24,6 @@ {% if site.after_footer_scripts %} {% for script in site.after_footer_scripts %} - {% if script contains "://" %} - {% capture script_path %}{{ script }}{% endcapture %} - {% else %} - {% capture script_path %}{{ script | relative_url }}{% endcapture %} - {% endif %} - + {% endfor %} {% endif %} diff --git a/_includes/seo.html b/_includes/seo.html index cb6e36ef47c2..bf2c89d94dc3 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -32,22 +32,13 @@ {%- assign author_twitter = author.twitter | replace: "@", "" -%} {%- endif -%} -{%- assign page_large_image = page.header.og_image | default: page.header.overlay_image | default: page.header.image -%} -{%- unless page_large_image contains '://' -%} - {%- assign page_large_image = page_large_image | absolute_url -%} -{%- endunless -%} +{%- assign page_large_image = page.header.og_image | default: page.header.overlay_image | default: page.header.image | absolute_url -%} {%- assign page_large_image = page_large_image | escape -%} -{%- assign page_teaser_image = page.header.teaser | default: site.og_image -%} -{%- unless page_teaser_image contains '://' -%} - {%- assign page_teaser_image = page_teaser_image | absolute_url -%} -{%- endunless -%} +{%- assign page_teaser_image = page.header.teaser | default: site.og_image | absolute_url -%} {%- assign page_teaser_image = page_teaser_image | escape -%} -{%- assign site_og_image = site.og_image -%} -{%- unless site_og_image contains '://' -%} - {%- assign site_og_image = site_og_image | absolute_url -%} -{%- endunless -%} +{%- assign site_og_image = site.og_image | absolute_url -%} {%- assign site_og_image = site_og_image | escape -%} {%- if page.date -%} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 2a1884edeb55..a4ca1ca78151 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -4,13 +4,8 @@ {% if page.sidebar %} {% for s in page.sidebar %} {% if s.image %} - + {% endif %} {% if s.title %}