diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index b7d62149927c..5c7304783926 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -5,23 +5,12 @@
{% if author.avatar %}
{{ author.name }}
YouTube
- {% else author.youtube %}
+ {% elsif author.youtube %}
{% endif %}
@@ -208,7 +197,7 @@ -
{%- for link in site.data.navigation.main -%}
- {%- if link.url contains '://' -%}
- {%- assign url = link.url -%}
- {%- else -%}
- {%- assign url = link.url | relative_url -%}
- {%- endif -%}
-
{% 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 %}
-
- {% comment %} set "active" class on current page {% endcomment %}
- {% if child.url == page.url %}
- {% assign active = "active" %}
- {% else %}
- {% assign active = "" %}
- {% endif %}
-
-
- {{ child.title }} +
- {{ child.title }} {% endfor %}
{% endif %} {% if page.header.cta_url %} - + {% endif %} {% 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 %} {% else %} - + {% endif %} {% if page.header.caption %} 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 %}