From 9def1f627ff9502b5d9117d90f07f0600099d22a Mon Sep 17 00:00:00 2001 From: Larsenv Date: Sun, 22 Oct 2017 08:57:36 -0500 Subject: [PATCH] Removed ads that are not even ours --- _layouts/single-no-ads.html | 78 ------------ _layouts/single.html | 228 ++++++++++++------------------------ _layouts/splash.html | 53 +-------- 3 files changed, 80 insertions(+), 279 deletions(-) delete mode 100644 _layouts/single-no-ads.html diff --git a/_layouts/single-no-ads.html b/_layouts/single-no-ads.html deleted file mode 100644 index 203fecd76..000000000 --- a/_layouts/single-no-ads.html +++ /dev/null @@ -1,78 +0,0 @@ ---- -layout: default ---- - -{% include base_path %} - -{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} - {% include page__hero.html %} -{% endif %} - -{% if page.url != "/" and site.breadcrumbs %} - {% unless paginator %} - {% include breadcrumbs.html %} - {% endunless %} -{% endif %} - -
- {% include sidebar.html %} - -
- {% if page.title %}{% endif %} - {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.modified %}{% endif %} - -
- {% unless page.header.overlay_color or page.header.overlay_image %} -
- {% if page.title %}

{{ page.title | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% if page.read_time %} -

{% include read-time.html %}

- {% endif %} -
- {% endunless %} - -
- {{ content }} - {% if page.link %}{% endif %} - -
- -
- {% if site.data.ui-text[site.locale].meta_label %} -

{{ site.data.ui-text[site.locale].meta_label }}

- {% endif %} - {% include page__taxonomy.html %} - {% if page.modified %} -

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

- {% elsif page.date %} -

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

- {% endif %} -
- - {% if page.share %}{% include social-share.html %}{% endif %} - - {% include post_pagination.html %} -
- - {% if site.comments.provider and page.comments %} - {% include comments.html %} - {% endif %} - -
- - {% comment %}{% endcomment %} - {% if page.id and page.related and site.related_posts.size > 0 %} - - {% endif %} -
diff --git a/_layouts/single.html b/_layouts/single.html index f81d9a397..203fecd76 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -1,150 +1,78 @@ ---- -layout: default ---- - -{% include base_path %} - -{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} - {% include page__hero.html %} -{% endif %} - -{% if page.url != "/" and site.breadcrumbs %} - {% unless paginator %} - {% include breadcrumbs.html %} - {% endunless %} -{% endif %} - - - - -
- {% include sidebar.html %} - -
- {% if page.title %}{% endif %} - {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.modified %}{% endif %} - -
- {% unless page.header.overlay_color or page.header.overlay_image %} -
- {% if page.title %}

{{ page.title | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% if page.read_time %} -

{% include read-time.html %}

- {% endif %} -
- {% endunless %} - -
- -
- - {% assign split_path = page.path | split: "/" %} - {% assign locale = split_path[1] %} - - {% for link in site.data.navigation[locale].bottom %} - {% if link.url contains 'http' %} - {% assign domain = '' %} - {% else %} - {% assign domain = site.url | append: site.baseurl %} - {% endif %} -
{{ link.title }}
- {% endfor %} - -
- -
- - - - - - - -
- -
- - {{ content }} - {% if page.link %}{% endif %} - -
- -
- - - - - - -
- -
- -
- {% if site.data.ui-text[site.locale].meta_label %} -

{{ site.data.ui-text[site.locale].meta_label }}

- {% endif %} - {% include page__taxonomy.html %} - {% if page.modified %} -

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

- {% elsif page.date %} -

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

- {% endif %} -
- - {% if page.share %}{% include social-share.html %}{% endif %} - - {% include post_pagination.html %} -
- - {% if site.comments.provider and page.comments %} - {% include comments.html %} - {% endif %} - -
- - {% comment %}{% endcomment %} - {% if page.id and page.related and site.related_posts.size > 0 %} - - {% endif %} -
+--- +layout: default +--- + +{% include base_path %} + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
+ {% include sidebar.html %} + +
+ {% if page.title %}{% endif %} + {% if page.excerpt %}{% endif %} + {% if page.date %}{% endif %} + {% if page.modified %}{% endif %} + +
+ {% unless page.header.overlay_color or page.header.overlay_image %} +
+ {% if page.title %}

{{ page.title | markdownify | remove: "

" | remove: "

" }}

{% endif %} + {% if page.read_time %} +

{% include read-time.html %}

+ {% endif %} +
+ {% endunless %} + +
+ {{ content }} + {% if page.link %}{% endif %} + +
+ +
+ {% if site.data.ui-text[site.locale].meta_label %} +

{{ site.data.ui-text[site.locale].meta_label }}

+ {% endif %} + {% include page__taxonomy.html %} + {% if page.modified %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+ {% elsif page.date %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+ {% endif %} +
+ + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %} +
+ + {% if site.comments.provider and page.comments %} + {% include comments.html %} + {% endif %} + +
+ + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} + + {% endif %} +
diff --git a/_layouts/splash.html b/_layouts/splash.html index 7d8e8fb71..48f4682a2 100644 --- a/_layouts/splash.html +++ b/_layouts/splash.html @@ -8,14 +8,6 @@ layout: default {% include page__hero.html %} {% endif %} - - -
@@ -27,7 +19,7 @@ layout: default

- + {% assign split_path = page.path | split: "/" %} {% assign locale = split_path[1] %} @@ -42,53 +34,12 @@ layout: default
-
- - - - - -
-
- + {{ content }}

- -
- - - - - - -