From 8e2d290c7f0f7dc46e9aed110ba90a2904b18287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?iBug=20=E2=99=A6?=
{% if include.date %}
{% if include.index %}{% endif %}
-
+
{% if include.index %}{% endif %}
{% endif %}
{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}
{% elsif page.date %} -{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}
+{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}
{% endif %} From 65051cce2eccbc9eee421cbda998fb9241756dae Mon Sep 17 00:00:00 2001 From: Michael Rose" | remove: "
" }} {% endif %} - {% if page.header.show_overlay_excerpt != false and page.excerpt %} + {% if page.tagline %} +{{ page.tagline | markdownify | remove: "
" | remove: "
" }} + {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}{{ page.excerpt | markdownify | remove: "
" | remove: "
" }} {% endif %} {% if page.read_time %} From 6deaab8d3a2a9995ebb6d7773d05b284814f96b1 Mon Sep 17 00:00:00 2001 From: Michael Rose{% 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 %}
{{ page.excerpt | markdownify | remove: "
" | remove: "
" }} {% endif %} - {% if page.read_time %} - - {% endif %} + {% include post__meta.html %} {% if page.header.cta_url %} {% endif %} diff --git a/_includes/post__meta.html b/_includes/post__meta.html new file mode 100644 index 000000000000..1ea81e5bbcba --- /dev/null +++ b/_includes/post__meta.html @@ -0,0 +1,35 @@ +{% assign page = post | default: page %} + +{% if page.read_time or page.show_date %} + +{% endif %} \ No newline at end of file diff --git a/_includes/read-time.html b/_includes/read-time.html deleted file mode 100644 index 588574433c50..000000000000 --- a/_includes/read-time.html +++ /dev/null @@ -1,15 +0,0 @@ -{% assign words_per_minute = page.words_per_minute | default: site.words_per_minute | default: 200 %} - -{% if post.read_time %} - {% assign words = post.content | strip_html | number_of_words %} -{% elsif page.read_time %} - {% assign words = page.content | strip_html | number_of_words %} -{% endif %} - -{% if words < words_per_minute %} - {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} -{% elsif words == words_per_minute %} - 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} -{% else %} - {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} -{% endif %} diff --git a/_layouts/single.html b/_layouts/single.html index c58eca02330f..7116d72d688b 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -27,9 +27,7 @@ {% unless page.header.overlay_color or page.header.overlay_image %}" | remove: "
" }}_kG?|JViB5mn<#ZP
zo78NIQEdbn{UKMfw5uAPU{s12q$*XgFWsXV2%f&H5K6t_XdADT$X*H+B|B&A=rHXW
zVA&IPRDYt6db#b+TS8x`!;Xga@CPk0vbPqT!6cjxcM1GhQHtC%M#8-02iYmcn0%5H
zgJ^Y7Ay4h)F3Oo%n4&HIHHVw`ga|1q!ZpF54_jvJxM7o4O=68m8S-Qv4!0Sa%T$A)
z&D(ftUu6Pr>7n~-hmrPi{cBk_NeXtSX_~~gZ@U@z&k9y|fBkXMxlCc*uB^8euT|q%
zw&m`&?>OOuV__tv7szr3$~?`WyD9AF%g%FgOzr%#PUxDat+<54SX3bP2bSXoymuCzJLzPoT@kTK!vP<0
z#oy4d<7CXq2B|}w`Gy>ZWS-@NZk1t&jX?%GXFC{A=NlLFU0n?OD(AXSEMfv;Oy4N7
zgK8C%E@>qVU$16su$S|9utx74eZ}Ddag^$o!GEcs4(X!ddqX{Rk>kOPHFB#PaQYXo
zFUB_@Au8DJGo>913TdwpJ;V3G+T+;Zpy86p8JjNo5VGKU(6-b%a1KRP#o+8c>}Da2RjsT)Xt9NT
z>tr!M7r