Removed google from my page, I hope! and removed <<<<head from thingy…

… thanks @batpigandme
RMHogervorst · Dec 9, 2017 · 735bc4e · 735bc4e
1 parent 720e647
commit 735bc4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/_config.yml b/_config.yml
@@ -27,12 +27,11 @@ kramdown:
 
 mathjax: true
 
-mathjax: true
 
 include: [".htaccess"]
 exclude: ["lib", "config.rb", "Gemfile", "Capfile", "README.md", "LICENSE", "Gemfile.lock", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "vendor"]
 
-comments: true
+comments: false
 
 # Octopress
 

diff --git a/_includes/ad-sidebar.html b/_includes/ad-sidebar.html
@@ -1,26 +1,10 @@
 <div class="google-ads" style="margin-top:40px; text-align:center;">
-<<<<<<< HEAD
   <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
   <!-- 160x600 ad -->
   <ins class="adsbygoogle"
        style="display:inline-block;width:160px;height:600px"
        data-ad-client="{{ site.owner.google.ad-client }}"
        data-ad-slot="{{ site.owner.google.ad-slot }}"></ins>
-=======
-  <style>
-  .responsive-ads { width: 300px; height: 200px; }
-  @media(min-width: 518px) { .responsive-ads { width: 468px; height: 60px; } }
-  @media(min-width: 778px) { .responsive-ads { width: 728px; height: 90px; } }
-  @media(min-width: 1000px) { .responsive-ads { width: 160px; height: 600px; } }
-  </style>
 
-  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-  <ins class="adsbygoogle responsive-ads"
-    style="display:inline-block"
-    data-ad-client="{{ site.owner.google.ad-client }}"
-    data-ad-slot="{{ site.owner.google.ad-slot }}"></ins>
->>>>>>> origin/gh-pages
-  <script>
-  (adsbygoogle = window.adsbygoogle || []).push({});
   </script>
 </div><!-- /.google-ads -->
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -40,7 +40,7 @@ <h1 class="entry-title" itemprop="name">{% if page.headline %}{{ page.headline }
         {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}"><i class="fa fa-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
         {% if (site.owner.disqus-shortname and page.comments) or site.comments %}<span class="entry-comments"><i class="fa fa-comment-o"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
         {% if page.share %}{% include social-share.html %}{% endif %}
-        {% if page.ads != true %}{% include ad-sidebar.html %}<!-- /.google-ads -->{% endif %}
+
       </footer>
       <div class="entry-content">
         {{ content }}