Merge branch 'iandoug-master'

CONTRIB.md

@@ -6,8 +6,9 @@ Special thanks to the following contributors:
   support
 * [jasonm23](https://github.com/jasonm23), for initial Custom Styles 
   implementation
-* [iandoug](http://iandoug.com/?p=64), for the case background textures & 
-  related options.
+* [iandoug](http://iandoug.com/?p=64), for first versions of: Move/Size/Angle stepsize; case background textures & 
+  related options; default switch options.
+* [Kevin Schoedel](https://github.com/datatravelandexperiments) for the Colors in Keyboard patch
 
 The following users have contributed some of the sample keyboard layouts & 
 presets:
@@ -39,6 +40,7 @@ keyboard-layout-editor.com:
 * [Jison](http://zaach.github.io/jison/) (JavaScript parser generator)
 * [Hint.css](http://kushagragour.in/lab/hint/) (CSS-only tooltips)
 * [doT.js](http://olado.github.io/doT/) (fast micro-templating)
+* [html2canvas](https://github.com/niklasvh/html2canvas)
 * [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
 * [C64 TrueType Font](http://style64.org/c64-truetype) font (by 
   [Style64.org](https://www.style64.org))

Makefile

@@ -89,6 +89,7 @@ $(call BOWER,bower_components/marked/marked.min.js)
 $(call BOWER,bower_components/FileSaver/FileSaver.min.js)
 $(call BOWER,bower_components/doT/doT.min.js)
 $(call BOWER,bower_components/URLON/src/urlon.js)
+$(call BOWER,bower_components/html2canvas/build/html2canvas.min.js)
 
 
 # Rules to generate a webfont from our source .svg files

bower.json

@@ -44,6 +44,7 @@
     "hint.css": "1.3.5",
     "angular-cookies": "1.2.28",
     "ace-builds": "1.2.0",
-    "angular-ui-ace": "0.2.3"
+    "angular-ui-ace": "0.2.3",
+    "html2canvas": "0.4.1"
   }
 }

colors.json

@@ -302,8 +302,8 @@
 	},
 	{
 		"name" : "WASD keyboards",
-		"href" : "http://www.wasdkeyboards.com/index.php/products/sampler-kit/wasd-sampler-kit-o-ring-keycaps.html",
-		"description" : "These are the 11 colors and their RGB codes, taken from the HTML code of the shop pages.",
+		"href" : "http://www.wasdkeyboards.com/index.php/products/keycap-set/104-key-cherry-mx-keycap-set.html",
+		"description" : "These are the 19 colors and their RGB codes, taken from the HTML code of the shop pages.",
 		"colors" : [
 			{ "name": "black", "r":26, "g":26, "b":26},
 			{ "name": "white", "r":255, "g":255, "b":255},

extensions.js

@@ -111,4 +111,19 @@
     return this;
   };
 
+  // Polyfill for HTMLCanvasElement.toBlob, which is currently only available on Firefox
+  if (typeof(HTMLCanvasElement) !== 'undefined' && !HTMLCanvasElement.prototype.toBlob) {
+    Object.defineProperty(HTMLCanvasElement.prototype, 'toBlob', {
+      value: function (callback, type, quality) {
+        var binStr = atob( this.toDataURL(type, quality).split(',')[1] ),
+            len = binStr.length,
+            arr = new Uint8Array(len);
+        for (var i=0; i<len; i++ ) {
+          arr[i] = binStr.charCodeAt(i);
+        }
+        callback( new Blob( [arr], {type: type || 'image/png'} ) );
+      }
+    });
+  }
+
 }());

font-src/kbd-custom.pe

@@ -13,8 +13,26 @@ Select(0uE609); Import("font-src/logo-linux-tux.svg",0,16);
 Select(0uE60A); Import("font-src/logo-linux-tux-ibm.svg",0,16);
 Select(0uE60B); Import("font-src/logo-linux-tux-ibm-invert.svg",0,16);
 
+Select(0uE60C); Import("font-src/logo-atari.svg",0,16);
+Select(0uE60D); Import("font-src/logo-linux-archlinux.svg",0,16);
+Select(0uE60E); Import("font-src/logo-bsd-freebsd.svg",0,16);
+Select(0uE60F); Import("font-src/logo-linux-centos.svg",0,16);
+Select(0uE610); Import("font-src/logo-winlin-cygwin.svg",0,16);
+Select(0uE611); Import("font-src/logo-linux-debian.svg",0,16);
+Select(0uE612); Import("font-src/logo-linux-edubuntu.svg",0,16);
+Select(0uE613); Import("font-src/logo-linux-fedora.svg",0,16);
+Select(0uE614); Import("font-src/logo-linux-gentoo.svg",0,16);
+Select(0uE615); Import("font-src/logo-gnu.svg",0,16);
+Select(0uE616); Import("font-src/logo-linux-knoppix.svg",0,16);
+Select(0uE617); Import("font-src/logo-linux-redhat.svg",0,16);
+Select(0uE618); Import("font-src/logo-linux-opensuse.svg",0,16);
+Select(0uE619); Import("font-src/logo-android.svg",0,16);
+
 Select(0uE700); Import("font-src/community-hapster.svg",0,16);
 Select(0uE701); Import("font-src/community-awesome.svg",0,16);
 Select(0uE702); Import("font-src/community-awesome-invert.svg",0,16);
 
+Select(0uE703); Import("font-src/copyleft.svg",0,16);
+Select(0uE704); Import("font-src/batman.svg",0,16);
+
 Generate($2);