Merge branch 'release/0.8.1'

Marco Solazzi · Marco Solazzi · commit 588af3010f1c · 2014-12-16T09:51:25.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -111,6 +111,7 @@ lib
 www/*
 #share vendors
 !www/vendor
+www/vendor/dist
 www/vendor/vendor.min.*
 www/vendor/modernizr/modernizr.min.*
 !www/.htaccess
diff --git a/.jscsrc b/.jscsrc
@@ -5,5 +5,5 @@
     "disallowSpacesInAnonymousFunctionExpression": null,
     "disallowSpacesInFunctionExpression": null,
 	"disallowMultipleLineBreaks": null,
-    "excludeFiles": ["node_modules/**"]
+    "excludeFiles": ["node_modules/**", "www/vendor/**"]
 }
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wok",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "authors": [
     "Marco Solazzi <marco.solazzi@intesys.it>",
     "Matteo Guidotto <matteo.guidotto@intesys.it>",
@@ -16,6 +16,7 @@
     "tests"
   ],
   "dependencies": {
-    "normalize-css": "~3.0.1"
+    "normalize-css": "~3.0.1",
+    "modernizr": "~2.8.3"
   }
 }
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
@@ -411,7 +411,7 @@ module.exports = function(grunt) {
                 extra: {
                     shiv: true,
                     printshiv: false,
-                    load: true,
+                    load: false, //excude yepnope
                     mq: false,
                     cssclasses: true
                 },
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wok",
   "description": "A Static Website Boilerplate",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "MIT",
   "author": {
     "name": "Marco Solazzi",
diff --git a/www/vendor/modernizr/modernizr.js b/www/vendor/modernizr/modernizr.js

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`"disallowSpacesInAnonymousFunctionExpression": null,`
`6`	`6`	`"disallowSpacesInFunctionExpression": null,`
`7`	`7`	`"disallowMultipleLineBreaks": null,`
`8`		`- "excludeFiles": ["node_modules/**"]`
	`8`	`+ "excludeFiles": ["node_modules/", "www/vendor/"]`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wok",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"authors": [`
`5`	`5`	`"Marco Solazzi <marco.solazzi@intesys.it>",`
`6`	`6`	`"Matteo Guidotto <matteo.guidotto@intesys.it>",`
`@@ -16,6 +16,7 @@`
`16`	`16`	`"tests"`
`17`	`17`	`],`
`18`	`18`	`"dependencies": {`
`19`		`- "normalize-css": "~3.0.1"`
	`19`	`+ "normalize-css": "~3.0.1",`
	`20`	`+ "modernizr": "~2.8.3"`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wok",`
`3`	`3`	`"description": "A Static Website Boilerplate",`
`4`		`- "version": "0.9.0",`
	`4`	`+ "version": "0.9.1",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Marco Solazzi",`