diff options
| -rw-r--r-- | _includes/footer.html | 15 | ||||
| -rw-r--r-- | _layouts/post.html | 68 | ||||
| -rw-r--r-- | _sass/_layout.scss | 8 |
3 files changed, 11 insertions, 80 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 4aa38f6..73c67cd 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -88,18 +88,3 @@ $(document).ready(function() { <script src='/js/{{ js_file }}.js' type="text/javascript"></script> {% endfor %} {% endif %} - -{% if site.ga_tracking_id %} -<!-- Google Analytics --> -<script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', '{{ site.ga_tracking_id }}', 'auto'); - ga('send', 'pageview', { - 'page': '{{ page.url }}', - 'title': '{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}' - }); -</script> -{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index a6861f5..bd8c381 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -45,52 +45,6 @@ layout: default <p class="rss-subscribe text"><strong>Subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></strong></p> </section> -<section class="share"> - <span>Share: </span> - {% for social in site.social %} - {% capture full_url %}{{ site.url }}{{ site.baseurl }}{{ page.url }}{% endcapture %} - {% if social.name == "Twitter" and social.share == true %} - <a href="//twitter.com/share?text={{ page.title | cgi_escape }}&url={{ full_url | cgi_escape}}&via={{social.username}}" - onclick="window.open(this.href, '{{ social.icon }}-share', 'width=550,height=255');return false;"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "Facebook" and social.share == true %} - <a href="//www.facebook.com/sharer.php?t={{ page.title | cgi_escape }}&u={{ full_url | cgi_escape}}" - onclick="window.open(this.href, '{{ social.icon }}-share', 'width=550,height=255');return false;"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "Google+" and social.share == true %} - <a href="//plus.google.com/share?title={{ page.title | cgi_escape }}&url={{ full_url | cgi_escape}}" - onclick="window.open(this.href, '{{ social.icon }}-share', 'width=550,height=255');return false;"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "LinkedIn" and social.share == true %} - <a href="//www.linkedin.com/shareArticle?mini=true&url={{ full_url | cgi_escape}}" - onclick="window.open(this.href, '{{ social.icon }}-share', 'width=550,height=255');return false;"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "Pinterest" and social.share == true %} - <a href="//www.pinterest.com/pin/create/button/?description={{ page.title | cgi_escape }}&url={{ full_url | cgi_escape}}&media={{ site.url }}{% if page.cover %}{{ page.cover | prepend: site.baseurl }}{% elsif site.cover %}{{ site.cover | prepend: site.baseurl }}{% else %}{{ site.logo | prepend: site.baseurl }}{% endif %}" - onclick="window.open(this.href, '{{ social.icon }}-share', 'width=550,height=255');return false;"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "Reddit" and social.share == true %} - <a href="//www.reddit.com/submit" onclick="window.location = '//www.reddit.com/submit?url=' + encodeURIComponent('{{ full_url }}') + '&title={{page.title}}'; return false"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }}-square fa-lg"></i> - </a> - {% endif %} - {% if social.name == "Hacker News" and social.share == true %} - <a href="//news.ycombinator.com/submitlink" onclick="window.location = '//news.ycombinator.com/submitlink?u=' + encodeURIComponent('{{ full_url }}') + '&t={{page.title}}'; return false"> - <i class="fa fa-{{ social.icon | remove_first: '-square' }} fa-lg"></i> - </a> - {% endif %} - {% endfor %} -</section> {% if site.inter_post_navigation == true %} <section class="post-navigation"> <span class="prev-post"> @@ -118,25 +72,11 @@ layout: default </section> {% endif %} -{% if site.disqus_shortname %} -{% unless page.disqus_disabled %} -<section class="disqus"> - <div id="disqus_thread"></div> - <script type="text/javascript"> - var disqus_shortname = '{{ site.disqus_shortname }}'; - - /* * * DON'T EDIT BELOW THIS LINE * * */ - (function() { - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js'; - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); - })(); - </script> - <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> - <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> +<section class="comments"> + <div id="comments-thread"></div> + <script id="comments-client" type="module" src="http://127.0.0.1:5000/static/js/client.js"></script> + <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments.</a></noscript> </section> -{% endunless %} -{% endif %} </div> </div> diff --git a/_sass/_layout.scss b/_sass/_layout.scss index c2439b4..d35fc76 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -317,9 +317,15 @@ pre code.hljs { text-decoration: none; } } - .disqus { + .comments { @include span-columns(12); } + + .comment-section { + @include span-columns(12); + margin-top: 10px; + } + .post-navigation { font-size: 0.9em; display: block; |