Merge pull request barryclark#9 from joariasl/master

Implementing SASS, mailto JavaScript protection and XHTML to HTML definition
tonymaibox · Sep 27, 2015 · b006ce7 · b006ce7
2 parents 57d0fd0 + 04e2094
commit b006ce7
Show file tree

Hide file tree

Showing 64 changed files with 183 additions and 14,254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,10 @@ auto-save-list
 tramp
 .\#*
 
-_site/*
+_site/
+.sass-cache/
+*.swp
+pkg/
+test/
 _deploy/*
-Rakefile
+Rakefile
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,7 @@
 # Site settings
 
 url: "http://panossakkos.github.io"
+lang: "en"
 title: "{ Panos Sakkos }"
 description: "Blog and website of Panos Sakkos, blogging mainly for tech. Opinions expressed are mine."
 keywords: "panos, sakkos, panos sakkos, technology, computer science, Pwn Mail, WriteRight, UoA, di, CERN, MDCN, Microsoft"
@@ -19,6 +20,10 @@ pages_list:
   Career: 'career'
   Contact: 'contact'
 
+# Enable minification SASS
+sass:
+  style: compressed
+
 background-img: "/img/intro-bg.jpg"
 
 # About variables

diff --git a/_includes/career.html b/_includes/career.html
@@ -24,7 +24,7 @@
                           <h4>{{ event.date }}</h4>
                       </div>
                       <div class="timeline-body">
-                          <p class="text-muted">{{ event.description | markdownify }}</p>
+                          {{ event.description | markdownify }}
                       </div>
                   </div>
               </li>

diff --git a/_includes/contact.html b/_includes/contact.html
@@ -6,7 +6,24 @@
           {{ page.content | markdownify }}
 
           {% if page.email %}
-            <p><a href="mailto:{{ page.email }}">{{ page.email }}</a></p>
+			{% if page.email contains '@' %}
+				{% assign newemail = page.email | split: '@' %}
+				<p>
+				  <script>
+					  function join_at_email(user, domain){
+						  return (user && domain)?(user + "@" + domain):"";
+					  }
+					  document.write('<a href="mailto:'
+						+ join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
+						+ '">'
+						+ join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
+						+ '</a>'
+					  );
+				  </script>
+				</p>
+			{% else %}
+				<p><a href="mailto:{{ page.email }}">{{ page.email }}</a></p>
+			{% endif %}
           {% endif %}
 
           {% include social-buttons.html %}

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -5,5 +5,5 @@
         </div>
     </footer>
 
-    <p><br /><br /><br /><br /><br /><br /></p>
+    <p><br><br><br><br><br><br></p>
 
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,25 +1,25 @@
 <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="description" content="{{ site.description }}" />
-    <meta name="author" content="{{ site.author }}" />
-    <meta name="keywords" content="{{ site.keywords }}" />
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="{{ site.description }}">
+    <meta name="author" content="{{ site.author }}">
+    <meta name="keywords" content="{{ site.keywords }}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
     {% if page.url == "/404.html" %}
       <meta http-equiv="refresh" content="20; url=/">
     {% endif %}
     <title>{{ site.title }} {% if page.title %} | {{ page.title }}{% endif %}</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
 
     <!-- Custom CSS -->
     <link href="/css/grayscale.css" rel="stylesheet">
     <link href="/css/timeline.css" rel="stylesheet">
 
     <!-- Custom Fonts -->
-    <link href="/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <link href="//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
     <link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
 
@@ -29,5 +29,7 @@
         <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon }}">
+    {% if site.favicon %}
+      <link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon }}">
+    {% endif %}
 </head>
diff --git a/_includes/js.html b/_includes/js.html
@@ -1,13 +1,14 @@
 <!-- jQuery -->
-<script src="/js/jquery.js"></script>
+<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
 
 <!-- Bootstrap Core JavaScript -->
-<script src="/js/bootstrap.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 
 <!-- Plugin JavaScript -->
-<script src="/js/jquery.easing.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
 
 <!-- Custom Theme JavaScript -->
+
 <script src="/js/grayscale.js"></script>
 
 {% if site.google-tracking-id %}
@@ -51,24 +52,24 @@
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
     })();
     </script>
-  {% endif %}
-
-{% endif %}
+    
+    {% if page.section-type == "post" or page.section-type == "blog" or page.section-type == "index" or page.section-type == "tag" %}
+	  <!-- Comments counter -->
 
-{% if page.section-type == "post" or page.section-type == "blog" or page.section-type == "index" or page.section-type == "tag" %}
+	  <script type="text/javascript">
+	  /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+	  var disqus_shortname = '{{ site.disqus-shortname }}'; // required: replace example with your forum shortname
 
-  <!-- Comments counter -->
-
-  <script type="text/javascript">
-  /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-  var disqus_shortname = '{{ site.disqus-shortname }}'; // required: replace example with your forum shortname
+	  /* * * DON'T EDIT BELOW THIS LINE * * */
+	  (function () {
+	  var s = document.createElement('script'); s.async = true;
+	  s.type = 'text/javascript';
+	  s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+	  (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+	  }());
+	  </script>
+	{% endif %}
+
+  {% endif %}
 
-  /* * * DON'T EDIT BELOW THIS LINE * * */
-  (function () {
-  var s = document.createElement('script'); s.async = true;
-  s.type = 'text/javascript';
-  s.src = '//' + disqus_shortname + '.disqus.com/count.js';
-  (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-  }());
-  </script>
 {% endif %}
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -10,7 +10,7 @@
             {% else %}
               <a class="navbar-brand page-scroll" href="/index.html#page-top">
             {% endif %}
-            <div><img src="{{ site.black-favicon }}" alt="">  {{ site.title }}</div>
+            <div>{% if site.black-favicon %}<img src="{{ site.black-favicon }}" alt="">  {% endif %}{{ site.title }}</div>
           </a>
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->

diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="{{ site.lang }}">
 
   {% include head.html %}
 

diff --git a/_layouts/error.html b/_layouts/error.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="{{ site.lang }}">
 
   {% include head.html %}
 

diff --git a/_layouts/index.html b/_layouts/index.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="{{ site.lang }}">
 
   {% include head.html %}
 

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="{{ site.lang }}">
 
   {% include head.html %}
 
@@ -13,7 +13,7 @@
 
         <h1><strong>{{ page.title }}</strong></h1>
       	<h4><strong>{{ page.date | date_to_string }}</strong>
-          <small> . {{ page.category }} . <a href="{{ page.url }}#disqus_thread">Comments</a><p/>
+          <small> . {{ page.category }} . <a href="{{ page.url }}#disqus_thread">Comments</a>
           {% for tag in page.tags %}
             <a href="/tags/{{ tag }}.html">#{{ tag }}</a>
           {% endfor %}

diff --git a/_layouts/tag.html b/_layouts/tag.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="{{ site.lang }}">
 
   {% include head.html %}
 

diff --git a/_sass/_mixins.scss b/_sass/_mixins.scss
@@ -0,0 +1 @@
+// Mixins
diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -0,0 +1,5 @@
+// Variables
+
+$primary: #fed136;
+$dark: #000;
+$light: #fff;