From 425dca5ae26a5d457f0a3ffee795445a5587e319 Mon Sep 17 00:00:00 2001 From: Hampton Catlin Date: Tue, 15 Oct 2013 09:18:56 -0400 Subject: [PATCH 1/3] Need to be a lot more clear about free/paid applications! plus open source or not --- source/assets/css/components/_lists.scss.erb | 4 ++++ source/install.html.haml | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/source/assets/css/components/_lists.scss.erb b/source/assets/css/components/_lists.scss.erb index 72fd307..ec42263 100644 --- a/source/assets/css/components/_lists.scss.erb +++ b/source/assets/css/components/_lists.scss.erb @@ -82,6 +82,10 @@ ol { ul, ol { list-style-position: outside; } + + span.info { + @include font-size-small; + } } } diff --git a/source/install.html.haml b/source/install.html.haml index 929278c..0285e45 100644 --- a/source/install.html.haml +++ b/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 From 9a45b34239b0a7ba7eb087bf36b4c37bf860db43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=82=8D=CB=84=E0=B8=B8=2E=CD=A1=CB=B3=CC=AB=2E=CB=84?= =?UTF-8?q?=E0=B8=B8=E2=82=8E?= Date: Tue, 15 Oct 2013 11:09:51 -0700 Subject: [PATCH 2/3] Update _contentinfo.haml Update for renamed repo --- source/layouts/regions/_contentinfo.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/layouts/regions/_contentinfo.haml b/source/layouts/regions/_contentinfo.haml index 628be66..bb418d5 100644 --- a/source/layouts/regions/_contentinfo.haml +++ b/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 From da0194f7677bfdb440b30bb6a95b17ae4709e4fb Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Tue, 15 Oct 2013 13:39:50 -0700 Subject: [PATCH 3/3] Make the Google analytics code work with the old and new GA versions. --- source/layouts/foot/_js.haml | 8 -------- source/layouts/head/_js.haml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/source/layouts/foot/_js.haml b/source/layouts/foot/_js.haml index 94e9304..0a0825e 100644 --- a/source/layouts/foot/_js.haml +++ b/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'); diff --git a/source/layouts/head/_js.haml b/source/layouts/head/_js.haml index 394c993..7729fbf 100644 --- a/source/layouts/head/_js.haml +++ b/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');