Merge branch 'master' of github.com:sass/sass-site

source/assets/css/components/_lists.scss.erb

@@ -82,6 +82,10 @@ ol {
 
     ul,
     ol { list-style-position: outside; }
+
+    span.info {
+      @include font-size-small;
+    }
   }
 }
 

source/install.html.haml

@@ -16,38 +16,47 @@ layout: layout_1_column
     %ul.list-feature
       %li
         = link_to "CodeKit", "http://incident57.com/codekit/"
-        %span.paid-icon
+        %span.info (Paid)
         %span.mac-icon
       %li
         = link_to "Compass", "http://compass.handlino.com/"
-        %span.paid-icon
+        %span.info (Paid, Open Source)
         %span.mac-icon
         %span.windows-icon
         %span.linux-icon
       %li
         = link_to "Hammer", "http://hammerformac.com/"
-        %span.paid-icon
+        %span.info (Paid)
         %span.mac-icon
       %li
         = link_to "Koala", "http://koala-app.com/"
+        %span.info (Open Source)
         %span.mac-icon
         %span.windows-icon
         %span.linux-icon
       %li
         = link_to "LiveReload", "http://livereload.com/"
+        %span.info (Paid, Open Source)
         %span.mac-icon
         %span.windows-icon
       %li
         = link_to "Mixture", "http://mixture.io/"
-        %span.paid-icon
+        %span.info (Paid)
         %span.mac-icon
         %span.windows-icon
       %li
         = link_to "Prepros", "http://alphapixels.com/prepros/"
+        %span.info (Open Source)
+        %span.mac-icon
+        %span.windows-icon
+      %li
+        = link_to "Prepros Pro", "http://alphapixels.com/prepros/pro"
+        %span.info (Paid)
         %span.mac-icon
         %span.windows-icon
       %li
         = link_to "Scout", "http://mhs.github.io/scout-app/"
+        %span.info (Open Source)
         %span.mac-icon
         %span.windows-icon
 

source/layouts/foot/_js.haml

@@ -5,11 +5,3 @@
 = javascript_include_tag  "sass"
 
 = yield_content :scripts_footer
-
-:javascript
-  (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-  function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-  e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-  e.src='//www.google-analytics.com/analytics.js';
-  r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-  ga('create','UA-535380-8');ga('send','pageview');

source/layouts/head/_js.haml

@@ -8,3 +8,25 @@
   try{Typekit.load();}catch(e){}
 
 = yield_content :scripts_header
+
+-# Old version of analytics (https://developers.google.com/analytics/devguides/collection/gajs/).
+:javascript
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-535380-8']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+-# New version of analytics (https://developers.google.com/analytics/devguides/collection/analyticsjs/).
+:javascript
+  (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', 'UA-535380-14', 'sass-lang.com');
+  ga('send', 'pageview');

source/layouts/regions/_contentinfo.haml

@@ -15,7 +15,7 @@
         %li.contentinfo-tools
           %ul
             %li= link_to "Style Guide", "/styleguide"
-            %li= link_to "Site Repo", "https://github.com/sass/sass.github.com"
+            %li= link_to "Site Repo", "https://github.com/sass/sass-site"
 
         %li.contentinfo-social
           %a.twitter-follow-button(href="https://twitter.com/SassCSS" data-show-count="false" data-size="large") Follow @SassCSS