Integrates new JS stuff

diff --git a/jekyll/_layouts/default.html b/jekyll/_layouts/default.html
index 2407ed998ee3a940174c879aade4d27fdf4cde7e..5cc26406d45e1bc0569f6116e9410bc7affbc040 100644 (file)
--- a/jekyll/_layouts/default.html
+++ b/jekyll/_layouts/default.html
@@ -13,9 +13,24 @@
     <link href='http://fonts.googleapis.com/css?family=Lato:100,300,700,300italic,700italic|Oswald:400,300' rel='stylesheet' type='text/css'>
     <link href="/atom.xml" type="application/atom+xml" rel="alternate" title="N, S o Vocal — The ATOM!">
     <script src="/js/prism.min.js" type="text/javascript"></script>
     <link href='http://fonts.googleapis.com/css?family=Lato:100,300,700,300italic,700italic|Oswald:400,300' rel='stylesheet' type='text/css'>
     <link href="/atom.xml" type="application/atom+xml" rel="alternate" title="N, S o Vocal — The ATOM!">
     <script src="/js/prism.min.js" type="text/javascript"></script>

+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>

     <script src="https://cdn.firebase.com/js/client/1.0.21/firebase.js"></script>
     <script src="https://cdn.firebase.com/js/client/1.0.21/firebase.js"></script>

+    <script src="/js/vendor/neon/neon.js"></script>
+    <script src="/js/vendor/neon/stdlib/node_support.js"></script>
+    <script src="/js/vendor/neon/stdlib/custom_event.js"></script>
+    <script src="/js/vendor/neon/stdlib/custom_event_support.js"></script>
+    <script src="/js/vendor/neon/stdlib/widget.js"></script>
+
+    <script src="js/unlimited_pizza.js"></script>
+    <script src="js/unlimited_pizza/melty_cheese.js"></script>

     <script type="text/javascript">
 
     <script type="text/javascript">
 

+      window.addEventListener('load', function () {
+        UnlimitedPizza.instance({
+          element : $('body')
+        }).activate();
+      });
+

       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-20018878-4']);
       _gaq.push(['_trackPageview']);
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-20018878-4']);
       _gaq.push(['_trackPageview']);

diff --git a/jekyll/css/application.css b/jekyll/css/application.css
index 7dff1eedc4f6c2f29311d6c4c9e0fdbe256f7457..d3ef945ee7ab7e27554fe800bd447979c0a7470e 100644 (file)
--- a/jekyll/css/application.css
+++ b/jekyll/css/application.css
@@ -101,7 +101,7 @@ nav ul li a:focus {
 .postcontainer.cyan .post-tags a {color: #74d0eb}
 .postcontainer.purple .post-tags a {color: #400098}
 
 .postcontainer.cyan .post-tags a {color: #74d0eb}
 .postcontainer.purple .post-tags a {color: #400098}
 

-.post-image {max-height: 36.923em; background-color: #d30058; margin-top: 3.077em; background-size: auto 100%}
+.post-image {max-height: 36.923em; background-color: #d30058; margin-top: 3.077em; background-size: auto 100%; overflow: hidden}

 
 .postcontainer.blue .post-image {background-color: #0081cb}
 .postcontainer.green .post-image {background-color: #43da30}
 
 .postcontainer.blue .post-image {background-color: #0081cb}
 .postcontainer.green .post-image {background-color: #43da30}


@@ -112,13 +112,8 @@ nav ul li a:focus {
 .postcontainer.cyan .post-image {background-color: #74d0eb}
 .postcontainer.purple .post-image {background-color: #400098}
 
 .postcontainer.cyan .post-image {background-color: #74d0eb}
 .postcontainer.purple .post-image {background-color: #400098}
 

-.postcontent {margin: 1.538em 3.077em;
-  -webkit-column-width: 36em;
-     -moz-column-width: 36em;
-          column-width: 36em;
-  -webkit-column-gap: 2em;
-     -moz-column-gap: 2em;
-          column-gap: 2em;
+.postcontent {margin: 1.538em 4.923em;
+  max-width: 64.615em;

 }
 
 .related p, .related li,
 }
 
 .related p, .related li,