Merge branch 'develop'

Author: pascalduez

Makefile

@@ -15,7 +15,7 @@ dist: $(DIST)
 
 dist/%.js: src/%.js
 	mkdir -p $(@D)
-	6to5 --optional selfContained $< -o $@
+	6to5 $< -o $@
 
 min: assets/js/main.min.js
 
@@ -33,4 +33,7 @@ sass:
 clean:
 	rm -rf $(DIST) assets/js/main.min.js assets/css
 
+rebuild:
+	rm -rf node_modules && npm install
+
 .PHONY: all dist min sass clean

assets/images/favicon.png

@@ -12,6 +12,5 @@
   },
   "groups": {
     "undefined": "General"
-  },
-  "shortcutIcon": "http://sass-lang.com/favicon.ico"
+  }
 }

default.json

@@ -3,7 +3,7 @@
   "description": "SassDoc's default theme",
   "title": "SassDoc Default Theme",
   "author": "SassDoc team",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "keywords": [
     "sassdoc-theme"
   ],
@@ -22,18 +22,18 @@
   ],
   "main": "dist",
   "dependencies": {
-    "6to5-runtime": "^3.2.1",
     "chroma-js": "^0.6.3",
-    "extend": "^1.0.0",
-    "fs-extra": "^0.1.0",
-    "html-minifier": "^0.6.9",
-    "promise-denodeify": "^1.2.2",
-    "sassdoc-extras": "^2.0.0",
+    "es6-denodeify": "^0.1.0",
+    "es6-promise": "^2.0.1",
+    "extend": "^2.0.0",
+    "fs-extra": "^0.16.3",
+    "html-minifier": "^0.7.0",
+    "sassdoc-extras": "^2.1.0",
     "swig": "1.4.0",
     "swig-extras": "^0.0.1"
   },
   "devDependencies": {
-    "6to5": "^3.2.1",
+    "6to5": "^3.6.0",
     "jshint": "^2.6.0",
     "uglify-js": "^2.4.15"
   }

package.json

@@ -1,6 +1,7 @@
 import chroma from 'chroma-js';
 import def from '../default';
-import denodeify from 'promise-denodeify';
+import { Promise } from 'es6-promise';
+import denodeify from 'es6-denodeify';
 import extend  from 'extend';
 import fs from 'fs';
 import fse from 'fs-extra';
@@ -9,9 +10,11 @@ import path from 'path';
 import sassdocExtras from 'sassdoc-extras';
 import swig from './swig';
 
-const copy = denodeify(fse.copy, Promise);
-const renderFile = denodeify(swig.renderFile, Promise);
-const writeFile = denodeify(fs.writeFile, Promise);
+denodeify = denodeify(Promise);
+
+const copy = denodeify(fse.copy);
+const renderFile = denodeify(swig.renderFile);
+const writeFile = denodeify(fs.writeFile);
 
 const applyDefaults = ctx =>
   extend({}, def, ctx, {
@@ -32,12 +35,7 @@ const shortcutIcon = (dest, ctx) => {
 
 export default (dest, ctx) => {
   ctx = applyDefaults(ctx);
-
-  sassdocExtras.markdown(ctx);
-  sassdocExtras.display(ctx);
-  sassdocExtras.groupName(ctx);
-  sassdocExtras.shortcutIcon(ctx);
-
+  sassdocExtras(ctx, 'markdown', 'display', 'groupName', 'shortcutIcon');
   ctx.data.byGroupAndType = sassdocExtras.byGroupAndType(ctx.data);
 
   const index = path.resolve(__dirname, '../views/documentation/index.html.swig');

src/index.js

@@ -6,5 +6,15 @@
 <meta name="viewport" content="width=device-width">
 <meta content="IE=edge, chrome=1" http-equiv="X-UA-Compatible">
 
+<!-- Open Graph tags -->
+<meta property="og:title" content="{{ project_title }} - SassDoc" />
+<meta property="og:type" content="website" />
+
+{% if package.description %}
+<meta property="og:description" content="{{ package.description | safe }}" />
+{% else %}
+<meta property="og:description" content="Release the docs!" />
+{% endif %}
+
 <!-- Thanks to Sass-lang.com for the icons -->
 <link href="{{ shortcutIcon.url }}" rel="shortcut icon">

views/includes/partials/head.html.swig

@@ -2,13 +2,14 @@
 <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery.min.js"><\/script>')</script>
 {% if googleAnalytics %}
 <script>
-  var _gaq = [['_setAccount', '{{ googleAnalytics }}'], ['_trackPageview']];
-  (function(d) {
-    var g = d.createElement('script'),
-        s = d.scripts[0];
-    g.src = '//ssl.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g, s);
-  }(document));
+  (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', '{{ googleAnalytics }}', 'auto');
+  ga('send', 'pageview');
+
 </script>
 {% endif %}
 {% if trackingCode %}