Follow some changes of Jekyll Now

(Not all of them, encoding SVG into base64 inside a stylesheet file is a weird idea...)
quassy · Apr 28, 2015 · e9f3727 · e9f3727
1 parent 792323d
commit e9f3727
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 46 deletions.
diff --git a/_includes/analytics.html b/_includes/analytics.html
@@ -5,9 +5,12 @@
 		(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.google_analytics }}', 'auto');
-		ga('send', 'pageview');
+		ga('send', 'pageview', {
+		  'page': '{{ page.url }}',
+		  'title': '{{ page.title | replace: "'", "\\'" }}'
+		});
 	</script>
 	<!-- End Google Analytics -->
 {% endif %}
diff --git a/_includes/app_content.html b/_includes/app_content.html
@@ -6,35 +6,35 @@ <h3 id="screenshots">Screenshots</h3>
 {% if post.package %}
   <h2 id="installation">Installation</h2>
   {% if post.repository or post.repository-unstable %}
-	<p><b>Behold!</b> Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.</p>
+    <p><b>Behold!</b> Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.</p>
   {% endif %}
     {% if post.repository %}<pre><code>    sudo apt-add-repository {{ post.repository }}
-    sudo apt-get update  
+    sudo apt-get update
     sudo apt-get install {{ post.package }}</code></pre>{% endif %}
-    
+
     {% if post.repository-unstable %}
-	  <p>The following code adds an <b>unstable repository</b>, use with even higher caution as things might break. </p>
-	<pre><code>    sudo apt-add-repository {{ post.repository-unstable }}
+      <p>The following code adds an <b>unstable repository</b>, use with even higher caution as things might break. </p>
+    <pre><code>    sudo apt-add-repository {{ post.repository-unstable }}
     sudo apt-get update
     sudo apt-get install {{ post.package }}</code></pre>{% endif %}
-	
+
 {% elseif post.installation %}
   <h2 id="installation">Installation</h2>
 
   {% foreach post.installation as dist %}
-    
+
   {% endforeach %}
 
   {% if post.installation %}
-	<p><b>Behold!</b> Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.</p>
+    <p><b>Behold!</b> Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.</p>
   {% endif %}
     {% if post.repository %}<pre><code>    sudo apt-add-repository {{ post.repository }}
-    sudo apt-get update  
+    sudo apt-get update
     sudo apt-get install {{ post.package }}</code></pre>{% endif %}
-    
+
     {% if post.repository-unstable %}
-	  <p>The following code adds an <b>unstable repository</b>, use with even higher caution as things might break. </p>
-	<pre><code>    sudo apt-add-repository {{ post.repository-unstable }}
+      <p>The following code adds an <b>unstable repository</b>, use with even higher caution as things might break. </p>
+    <pre><code>    sudo apt-add-repository {{ post.repository-unstable }}
     sudo apt-get update
     sudo apt-get install {{ post.package }}</code></pre>{% endif %}
 

diff --git a/_includes/meta.html b/_includes/meta.html
@@ -0,0 +1,18 @@
+    <meta charset="utf-8" />
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
+    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
+    <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>
+
+    {% if page.excerpt %}
+    <meta name="description" content="{{ page.excerpt| strip_html }}" />
+    <meta property="og:description" content="{{ page.excerpt| strip_html }}" />
+    {% else %}
+    <meta name="description" content="{{ site.description }}">
+    <meta property="og:description" content="{{ site.description }}" />
+    {% endif %}
+    <meta name="author" content="{{ site.name }}" />
+
+    {% if page.title %}
+    <meta property="og:title" content="{{ page.title }}" />
+    <meta property="twitter:title" content="{{ page.title }}" />
+    {% endif %}
diff --git a/_layouts/default-beta.html b/_layouts/default-beta.html
@@ -1,17 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8" />
-  <meta http-equiv='X-UA-Compatible' content='IE=edge'>
-  <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>
+  {% include meta.html %}
 
   <title>
     {% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}
   </title>
 
-  <meta name="author" content="{{ site.name }}" />
-  <meta name="description" content="{{ site.description }}">
-
   <!--[if lt IE 9]>
     <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,17 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8" />
-    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
-    <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>
+    {% include meta.html %}
 
     <title>
       {% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}
     </title>
 
-    <meta name="author" content="{{ site.name }}" />
-    <meta name="description" content="{{ site.description }}">
-
     <!--[if lt IE 9]>
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
@@ -27,11 +22,11 @@
 
     <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/style.css" />
     <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/octicons/2.1.2/octicons.min.css" />
-    
+
     <link rel="alternate" type="application/rss+xml" title="{{ site.name }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
 
     <!-- Created with Jekyll Now - http://github.com/barryclark/jekyll-now -->
-    
+
     <!-- http://realfavicongenerator.net/ -->
     <link rel="apple-touch-icon" sizes="57x57" href="{{ site.baseurl }}/images/logo/apple-touch-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="114x114" href="{{ site.baseurl }}/images/logo/apple-touch-icon-114x114.png">
@@ -53,20 +48,20 @@
     <meta name="msapplication-TileImage" content="{{ site.baseurl }}/images/logo/mstile-144x144.png">
     <meta name="msapplication-config" content="{{ site.baseurl }}/images/logo/browserconfig.xml">
     <meta name="application-name" content="elementary apps">
-    
+
   </head>
 
   <body>
     <div class="wrapper-masthead">
       <div class="container">
         <header class="masthead clearfix">
           <a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.avatar }}" /></a>
-          
+
           <div class="site-info">
             <h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
             <p class="site-description">{% if site.description_html %}{{ site.description_html }}{% else %}{{ site.description }}{% endif %}</p>
           </div>
-          
+
           <nav>
             <a href="{{ site.baseurl }}/">News</a>
             <a href="{{ site.baseurl }}/apps">Apps</a>

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -7,25 +7,25 @@
 <article class="post">
 
   <header>
-    
+
     <h1 id="{{ post.title }}">{{ post.title }}</h1>
     {% if post.generic and title_obvious != true %}<p>{{ post.generic }}</p>{% endif %}
-    
+
   </header>
 
   <div class="entry">
-    
+
     {{ content }}
-    
+
   </div>
 
   <footer>
-  
+
     <div class="date">
       Updated on {{ post.date | date: "%e %B %Y" }}
-    </div>  
-    
-    
+    </div>
+
+
     {% if post.category %}
       {% for site_category in site.data.categories %}
         {% if site_category.slug == post.category %}
@@ -39,8 +39,8 @@ <h1 id="{{ post.title }}">{{ post.title }}</h1>
       {% assign category_content = 'Posted in no particular category.' %}
     {% endif %}
 
-    <div>{{ category_content }}    
-    
+    <div>{{ category_content }}
+
     {% if post.tags.size > 0 %}
       {% capture tags_content %}Tagged with {% endcapture %}
       {% for post_tag in post.tags %}
@@ -51,16 +51,16 @@ <h1 id="{{ post.title }}">{{ post.title }}</h1>
         {% endfor %}
         {% if tag %}
           {% capture tags_content_temp %}{{ tags_content }}<a href="{{ site.baseurl }}/tag/{{ tag.slug }}/">{{ tag.name }}</a>{% if forloop.last == false %}, {% endif %}{% endcapture %}
-          {% assign tags_content = tags_content_temp %}    
+          {% assign tags_content = tags_content_temp %}
         {% endif %}
       {% endfor %}
     {% else %}
       {% assign tags_content = '' %}
     {% endif %}
-    
+
     {{ tags_content }}</div>
-    
+
   </footer>
-  
-  {% include disqus.html disqus_identifier=post.disqus_identifier %}
+
+  {% include disqus.html %}
 </article>