release: release version 0.8.0

Prepare for npm publishing

.gitignore

@@ -5,10 +5,16 @@
 node_modules
 npm-debug.log
 
+# node webkit cache
+cache
+
 # sublime text stuff (the -project should actually be shared, but then we'd have to share the same disk location)
 *.sublime-project
 *.sublime-workspace
 
+# netbeans project folder
+nbproject
+
 # git stackdumps
 *.stackdump
 
@@ -18,6 +24,14 @@ diff.txt
 
 # build destination
 dest
+build/closure/closure_compiled_binary.js
+
+# spriting artifacts
+src/img/icons.png
+src/css/icons.css
+
+# plato report directory
+report
 
 # marked as private
 *.private.*

.jscsrc

@@ -0,0 +1,75 @@
+{
+    "requireCurlyBraces": [
+        "if",
+        "else",
+        "for",
+        "while",
+        "do",
+        "try",
+        "catch"
+    ],
+    "requireOperatorBeforeLineBreak": true,
+    "requireCamelCaseOrUpperCaseIdentifiers": true,
+    "maximumLineLength": {
+      "value": 80,
+      "allExcept": ["comments", "regex"]
+    },
+    "validateIndentation": 2,
+    "validateQuoteMarks": "'",
+
+    "disallowMultipleLineStrings": true,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "disallowSpaceAfterPrefixUnaryOperators": true,
+    "disallowMultipleVarDecl": true,
+    "disallowKeywordsOnNewLine": ["else"],
+
+    "requireSpaceAfterKeywords": [
+      "if",
+      "else",
+      "for",
+      "while",
+      "do",
+      "switch",
+      "return",
+      "try",
+      "catch"
+    ],
+    "requireSpaceBeforeBinaryOperators": [
+        "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
+        "&=", "|=", "^=", "+=",
+
+        "+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
+        "|", "^", "&&", "||", "===", "==", ">=",
+        "<=", "<", ">", "!=", "!=="
+    ],
+    "requireSpaceAfterBinaryOperators": true,
+    "requireSpacesInConditionalExpression": true,
+    "requireSpaceBeforeBlockStatements": true,
+    "requireSpacesInForStatement": true,
+    "requireLineFeedAtFileEnd": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInAnonymousFunctionExpression": {
+        "beforeOpeningRoundBrace": false
+    },
+    "disallowSpacesInsideObjectBrackets": "all",
+    "disallowSpacesInsideArrayBrackets": "all",
+    "disallowSpacesInsideParentheses": true,
+
+    "disallowMultipleLineBreaks": true,
+    "disallowNewlineBeforeBlockStatements": true,
+    "disallowKeywords": ["with"],
+    "disallowSpacesInFunctionExpression": null,
+    "disallowSpacesInFunctionDeclaration": null,
+    "disallowSpacesInCallExpression": true,
+    "disallowSpaceAfterObjectKeys": false,
+    "requireSpaceBeforeObjectValues": true,
+    "requireCapitalizedConstructors": true,
+    "requireDotNotation": true,
+    "requireSemicolons": true,
+    "validateParameterSeparator": ", ",
+
+    "jsDoc": null
+}

.npmignore

@@ -0,0 +1,3 @@
+node_modules/
+test/
+

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.8
+  - "4.1"
 before_install:
   - npm update -g npm
   - npm install -g grunt-cli
@@ -12,3 +12,4 @@ before_install:
 before_script:
   - phantomjs --version
   - casperjs --version
+sudo: false

Gruntfile.js

@@ -1,32 +1,52 @@
-/**
- * How to run grunt tasks:
- *   - At project root, run 'npm install' - It will install nodedependencies declared in package,json in <root>/.node_modules
- *   - install grunt CLI tools globally, run 'npm install -g grunt-cli'
- *   - run a grunt target defined in Gruntfiles.js, ex: 'grunt lint'
- *
- * Note: The 'ghost' grunt task have special deps on CasperJS and phantomjs.
- *       For now, It's configured to run only on TravisCI where these deps are
- *       correctly defined.
- *       If you run this task locally, it may require some env set up first.
- */
-
-var SOURCE_FOLDER = "src";
-
 module.exports = function(grunt) {
-  var mapToSrcFolder = function (path) {return [SOURCE_FOLDER, path].join('/');};
 
-  var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder);
-  var piskelStyles = require('./src/piskel-style-list.js').styles.map(mapToSrcFolder);
+  // Update this variable if you don't want or can't serve on localhost
+  var hostname = 'localhost';
+
+  var PORT = {
+    PROD : 9001,
+    DEV : 9901,
+    TEST : 9991
+  };
+
+  var DEV_MODE = '?debug';
+
+  // create a version based on the build timestamp
+  var dateFormat = require('dateformat');
+  var version = '-' + dateFormat(new Date(), "yyyy-mm-dd-hh-MM");
+
+  /**
+   * Helper to prefix all strings in provided array with the provided path
+   */
+  var prefixPaths = function (paths, prefix) {
+    return paths.map(function (path) {
+      return prefix + path;
+    });
+  };
+
+  // get the list of scripts paths to include
+  var scriptPaths = require('./src/piskel-script-list.js').scripts;
+  var piskelScripts = prefixPaths(scriptPaths, "src/").filter(function (path) {
+    return path.indexOf('devtools') === -1;
+  });
+
+  // get the list of styles paths to include
+  var stylePaths = require('./src/piskel-style-list.js').styles;
+  var piskelStyles = prefixPaths(stylePaths, "src/");
+
+  var getCasperConfig = function (suiteName, delay, host) {
+    var testPaths = require('./test/casperjs/' + suiteName).tests;
+    var tests = prefixPaths(testPaths, "test/casperjs/");
 
-  var getGhostConfig = function (delay) {
     return {
-      filesSrc : ['test/integration/casperjs/*_test.js'],
+      filesSrc : tests,
       options : {
         args : {
-          baseUrl : 'http://localhost:' + '<%= connect.test.options.port %>/src/',
-          mode : '?debug',
+          baseUrl : 'http://' + host + ':' + PORT.TEST,
+          mode : DEV_MODE,
           delay : delay
         },
+        async : false,
         direct : false,
         logLevel : 'info',
         printCommand : false,
@@ -35,224 +55,294 @@ module.exports = function(grunt) {
     };
   };
 
+  var getConnectConfig = function (base, port, host) {
+    if (typeof base === 'string') {
+      base = [base];
+    }
+
+    return {
+      options: {
+        port: port,
+        hostname : host,
+        base: base
+      }
+    };
+  };
+
+  // load all grunt tasks
+  require('load-grunt-tasks')(grunt);
+
   grunt.initConfig({
     clean: {
-      before: ['dest'],
-      after: ['build/closure/closure_compiled_binary.js']
+      all: ['dest', 'src/img/icons.png', 'src/css/icons.css'],
+      prod: ['dest/prod', 'dest/tmp'],
+      desktop: ['dest/desktop', 'dest/tmp'],
+      dev: ['dest/dev', 'dest/tmp']
     },
+
+    /**
+     * STYLE CHECKS
+     */
+
+    leadingIndent : {
+      options: {
+        indentation : "spaces"
+      },
+      css : ['src/css/**/*.css']
+    },
+
+    jscs : {
+      options : {
+        "config": ".jscsrc",
+        "maximumLineLength": 120,
+        "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
+        "validateQuoteMarks": { "mark": "'", "escape": true },
+        "disallowMultipleVarDecl": "exceptUndefined",
+        "disallowSpacesInAnonymousFunctionExpression": null
+      },
+      js : [ 'src/js/**/*.js' , '!src/js/**/lib/**/*.js' ]
+    },
+
     jshint: {
       options: {
-        indent:2,
         undef : true,
         latedef : true,
         browser : true,
         trailing : true,
         curly : true,
-        es3 : true,
-        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true}
+        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true}
       },
       files: [
         'Gruntfile.js',
         'package.json',
         'src/js/**/*.js',
-        '!src/js/lib/**/*.js' // Exclude lib folder (note the leading !)
+        '!src/js/**/lib/**/*.js' // Exclude lib folder (note the leading !)
       ]
     },
-    connect : {
-      test : {
-        options : {
-          base : '.',
-          port : 4321
-        }
-      }
-    },
-    express: {
-      regular: {
-        options: {
-          port: 9001,
-          hostname : 'localhost',
-          bases: ['dest']
-        }
-      },
-      debug: {
-        options: {
-          port: 9901,
-          hostname : 'localhost',
-          bases: ['src']
-        }
-      }
+
+    /**
+     * SERVERS, BROWSER LAUNCHERS
+     */
+
+    connect: {
+      prod: getConnectConfig('dest/prod', PORT.PROD, hostname),
+      test: getConnectConfig(['dest/dev', 'test'], PORT.TEST, hostname),
+      dev: getConnectConfig(['dest/dev', 'test'], PORT.DEV, hostname)
     },
+
     open : {
-      regular : {
-        path : 'http://localhost:9001/'
+      prod : {
+        path : 'http://' + hostname + ':' + PORT.PROD + '/'
       },
-      debug : {
-        path : 'http://localhost:9901/?debug'
+      dev : {
+        path : 'http://' + hostname + ':' + PORT.DEV + '/' + DEV_MODE
       }
     },
 
     watch: {
-      scripts: {
+      prod: {
         files: ['src/**/*.*'],
-        tasks: ['merge'],
+        tasks: ['build'],
+        options: {
+          spawn: false
+        }
+      },
+      dev: {
+        files: ['src/**/*.*'],
+        tasks: ['build-dev'],
         options: {
           spawn: false
         }
       }
     },
-    ghost : {
-      'default' : getGhostConfig(5000),
-      local : getGhostConfig(50)
+
+    /**
+     * BUILD STEPS
+     */
+
+    sprite:{
+      all : {
+        src: 'src/img/icons/**/*.png',
+        dest: 'src/img/icons.png',
+        destCss: 'src/css/icons.css'
+      }
     },
+
     concat : {
       js : {
         options : {
           separator : ';'
         },
         src : piskelScripts,
-        dest : 'dest/js/piskel-packaged.js'
+        dest : 'dest/prod/js/piskel-packaged' + version + '.js'
       },
       css : {
         src : piskelStyles,
-        dest : 'dest/css/piskel-style-packaged.css'
+        dest : 'dest/prod/css/piskel-style-packaged' + version + '.css'
       }
     },
+
     uglify : {
       options : {
         mangle : true
       },
-      my_target : {
+      js : {
         files : {
-          'dest/js/piskel-packaged-min.js' : ['dest/js/piskel-packaged.js']
+          'dest/tmp/js/piskel-packaged-min.js' : ['dest/prod/js/piskel-packaged' + version + '.js']
         }
       }
     },
-    copy: {
-      main: {
+
+    includereplace: {
+      all: {
+        src: 'src/index.html',
+        dest: 'dest/tmp/index.html',
+        options : {
+          globals : {
+            'version' : version
+          }
+        }
+      }
+    },
+
+    replace: {
+      // main-partial.html is used when embedded in piskelapp.com
+      mainPartial: {
+        options: {
+          patterns: [{
+              match: /^(.|[\r\n])*<!--body-main-start-->/,
+              replacement: "{% raw %}",
+              description : "Remove everything before body-main-start comment"
+            },{
+              match: /<!--body-main-end-->(.|[\r\n])*$/,
+              replacement: "{% endraw %}",
+              description : "Remove everything after body-main-end comment"
+            },{
+              match: /([\r\n])  /g,
+              replacement: "$1",
+              description : "Decrease indentation by one"
+            }
+          ]
+        },
         files: [
-          {src: ['src/piskel-boot.js'], dest: 'dest/piskel-boot.js'},
-          {src: ['src/logo.png'], dest: 'dest/logo.png'},
-          {src: ['src/js/lib/iframeLoader.js'], dest: 'dest/js/lib/iframeLoader.js'},
-          {expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
-          {expand: true, src: ['**/*.html'], cwd: 'src/', dest: 'dest/', filter: 'isFile'}
+          // src/index.html should already have been moved by the includereplace task
+          {src: ['dest/tmp/index.html'], dest: 'dest/prod/piskelapp-partials/main-partial.html'}
+        ]
+      },
+      // remove the fake header from the desktop build
+      desktop: {
+        options: {
+          patterns: [{
+              match: /<!--standalone-start-->(?:.|[\r\n])*<!--standalone-end-->/,
+              replacement: "",
+              description : "Remove everything between standalone-start & standalone-end"
+            }
+          ]
+        },
+        files: [
+          {src: ['dest/prod/index.html'], dest: 'dest/prod/index.html'}
         ]
       }
     },
-    closureCompiler:  {
-      options: {
-        // [REQUIRED] Path to closure compiler
-        compilerFile: 'build/closure/closure_compiler_20130823.jar',
-
-        // [OPTIONAL] set to true if you want to check if files were modified
-        // before starting compilation (can save some time in large sourcebases)
-        //checkModified: true,
-
-        // [OPTIONAL] Set Closure Compiler Directives here
-        compilerOpts: {
-          /**
-           * Keys will be used as directives for the compiler
-           * values can be strings or arrays.
-           * If no value is required use null
-           */
-          //compilation_level: 'ADVANCED_OPTIMIZATIONS',
-          compilation_level: 'SIMPLE_OPTIMIZATIONS',
-          externs: ['build/closure/piskel-closure-externs.js'],
-          // Inject some constants in JS code, could we use that for appengine wiring ?
-          //define: ["'goog.DEBUG=false'"],
-          warning_level: 'verbose',
-          jscomp_off: ['checkTypes', 'fileoverviewTags'],
-          summary_detail_level: 1,
-          language_in: 'ECMASCRIPT3'
-          //output_wrapper: '"(function(){%output%}).call(this);"'
-        },
-        execOpts: { // [OPTIONAL] Set exec method options
-          maxBuffer: 999999 * 1024
-        }
 
+    copy: {
+      prod: {
+        files: [
+          // dest/js/piskel-packaged-min.js should have been created by the uglify task
+          {src: ['dest/tmp/js/piskel-packaged-min.js'], dest: 'dest/prod/js/piskel-packaged-min' + version + '.js'},
+          {src: ['dest/tmp/index.html'], dest: 'dest/prod/index.html'},
+          {src: ['src/logo.png'], dest: 'dest/prod/logo.png'},
+          {src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/prod/js/lib/gif/gif.ie.worker.js'},
+          {expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'},
+          {expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'}
+        ]
       },
-      compile: {
-
-        /**
-         *[OPTIONAL] Here you can add new or override previous option of the Closure Compiler Directives.
-         * IMPORTANT! The feature is enabled as a temporary solution to [#738](https://github.com/gruntjs/grunt/issues/738).
-         * As soon as issue will be fixed this feature will be removed.
-         */
-        TEMPcompilerOpts: {
-        },
-        src: [
-          'src/js/**/*.js',
-          'src/piskel-boot.js',
-          'src/piskel-script-list.js',
-          '!src/js/lib/**/*.js'
-        ],
-
-        // This generated JS binary is currently not used and even excluded from source control using .gitignore.
-        dest: 'build/closure/closure_compiled_binary.js'
+      dev: {
+        files: [
+          // in dev copy everything to dest/dev
+          {src: ['dest/tmp/index.html'], dest: 'dest/dev/index.html'},
+          {src: ['src/piskel-script-list.js'], dest: 'dest/dev/piskel-script-list.js'},
+          {src: ['src/piskel-style-list.js'], dest: 'dest/dev/piskel-style-list.js'},
+          {expand: true, src: ['js/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
+          {expand: true, src: ['css/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
+          {expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
+        ]
       }
     },
-    nodewebkit: {
-      options: {
-        build_dir: './dest/desktop/', // destination folder of releases.
-        mac: true,
-        win: true,
-        linux32: true,
-        linux64: true
+
+    /**
+     * TESTING
+     */
+
+    karma: {
+      unit: {
+        configFile: 'karma.conf.js'
+      }
+    },
+
+    ghost : {
+      'travis' : getCasperConfig('TravisTestSuite.js', 10000, hostname),
+      'local' : getCasperConfig('LocalTestSuite.js', 50, hostname)
+    },
+
+    /**
+     * DESKTOP BUILDS
+     */
+
+    nwjs: {
+      windows : {
+        options: {
+          version : "0.12.3",
+          build_dir: './dest/desktop/', // destination folder of releases.
+          win: true,
+          linux32: true,
+          linux64: true
+        },
+        src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
       },
-      src: ['./dest/**/*', "./package.json", "!./dest/desktop/"]
+      macos : {
+        options: {
+          osx64: true,
+          version : "0.12.3",
+          build_dir: './dest/desktop/'
+        },
+        src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
+      }
     }
   });
 
-  grunt.config.set('leadingIndent.indentation', 'spaces');
-  grunt.config.set('leadingIndent.jsFiles', {
-    src: [
-      'src/js/**/*.js',
-      '!src/js/lib/**/*.js'
-    ]
-  });
-  grunt.config.set('leadingIndent.cssFiles', {
-    src: ['src/css/**/*.css']
-  });
-
-  grunt.loadNpmTasks('grunt-closure-tools');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-express');
-  grunt.loadNpmTasks('grunt-ghost');
-  grunt.loadNpmTasks('grunt-open');
-  grunt.loadNpmTasks('grunt-leading-indent');
-  grunt.loadNpmTasks('grunt-node-webkit-builder');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-
   // Validate
-  grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
+  grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
+
+  // karma/unit-tests task
+  grunt.registerTask('unit-test', ['karma']);
 
   // Validate & Test
-  grunt.registerTask('test', ['lint', 'compile', 'connect:test', 'ghost:default']);
-
+  grunt.registerTask('test-travis', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:travis']);
   // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('precommit', ['lint', 'compile', 'connect:test', 'ghost:local']);
+  grunt.registerTask('test-local', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:local']);
+  grunt.registerTask('test-local-nolint', ['unit-test', 'build-dev', 'connect:test', 'ghost:local']);
 
-  // Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
-  grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
+  grunt.registerTask('test', ['test-travis']);
+  grunt.registerTask('precommit', ['test-local']);
 
-  grunt.registerTask('merge',  ['concat:js', 'concat:css', 'uglify', 'copy']);
+  grunt.registerTask('build-index.html', ['includereplace']);
+  grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
+  grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'copy:prod']);
+  grunt.registerTask('build-dev',  ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
 
   // Validate & Build
-  grunt.registerTask('default', ['clean:before', 'lint', 'compile', 'merge']);
+  grunt.registerTask('default', ['lint', 'build']);
 
   // Build stand alone app with nodewebkit
-  grunt.registerTask('desktop', ['default', 'nodewebkit']);
-
-  grunt.registerTask('server', ['merge', 'express:regular', 'open:regular', 'express-keepalive']);
+  grunt.registerTask('desktop', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:windows']);
+  grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos']);
 
   // Start webserver and watch for changes
-  grunt.registerTask('server:watch', ['server', 'watch']);
-
+  grunt.registerTask('serve', ['build', 'connect:prod', 'open:prod', 'watch:prod']);
   // Start webserver on src folder, in debug mode
-  grunt.registerTask('server:debug', ['express:debug', 'open:debug', 'express-keepalive']);
+  grunt.registerTask('serve-dev', ['build-dev', 'connect:dev', 'open:dev', 'watch:dev']);
+
+  grunt.registerTask('serve-debug', ['serve-dev']);
+  grunt.registerTask('play', ['serve-dev']);
 };

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -32,12 +32,16 @@ Integrated in **[piskelapp.com](http://piskelapp.com)**, you can share everythin
 Piskel supports the following browsers :
 * **Chrome** (latest)
 * **Firefox** (latest)
-* **Internet Explorer** 10+
+* **Internet Explorer** 11+
 
 ... and a fairly recent computer.
 
 We don't plan/want/could be forced into supporting older IEs. For Opera and Safari, we've never tested them but the gap shouldn't be huge.
 
+## Offline version
+
+Offline builds are available. More details in the [dedicated wiki page](https://github.com/juliandescottes/piskel/wiki/Desktop-applications).
+
 ## Built with
 
 The Piskel editor is purely built in **JavaScript, HTML and CSS**. It uses Canvas extensively for displaying all them pretty sprites.
@@ -45,6 +49,7 @@ The Piskel editor is purely built in **JavaScript, HTML and CSS**. It uses Canva
 We also use the following **libraries** :
 * [spectrum](https://github.com/bgrins/spectrum) : awesome standalone colorpicker
 * [gifjs](http://jnordberg.github.io/gif.js/) : generate animated GIFs in javascript, using webworkers
+* [supergif](https://github.com/buzzfeed/libgif-js) : modified version of SuperGif to parse and import GIFs
 * [jszip](https://github.com/Stuk/jszip) : create, read and edit .zip files with Javascript
 * [canvas-toBlob](https://github.com/eligrey/canvas-toBlob.js/) : shim for canvas toBlob
 * [jquery](http://jquery.com/) : used sporadically in the application
@@ -62,9 +67,21 @@ Help is always welcome !
 * **Issues** : Found a problem when using the application, want to request a feature, [open an issue](https://github.com/juliandescottes/piskel/issues).
 * **Participate** : Have a look at the [wiki](https://github.com/juliandescottes/piskel/wiki) to set up the development environment
 
-## Licensing
+## License
 
-Probably need to pick one at some point ... Until then it's a "do whatever you want with it" license.
+Copyright 2016 Julian Descottes
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 ## Mobile/Tablets
 

build/closure/piskel-closure-externs.js

@@ -1,18 +0,0 @@
-/**
- * @fileoverview Externs for Piskel
- *
- * @externs
- */
-
-// Piskel externs.
-var exports;
-var pskl_exports;
-var $;
-var console;
-var pskl;
-
-// Piskel libs externs.
-var define;
-var jQuery;
-var getComputedStyle;
-var URL;

karma.conf.js

@@ -0,0 +1,69 @@
+// Karma configuration
+// Generated on Tue Jul 22 2014 23:49:26 GMT+0200 (Romance Daylight Time)
+
+module.exports = function(config) {
+
+  var mapToSrcFolder = function (path) {return ['src', path].join('/');};
+
+  var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder);
+  piskelScripts.push('test/js/testutils/**/*.js');
+  piskelScripts.push('test/js/**/*.js');
+  
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: piskelScripts,
+
+
+    // list of files to exclude
+    exclude: [],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true
+  });
+};

misc/gif-tests/low-colors-no-transparency.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"low-colors-no-transparency","description":"","fps":12,"height":60,"width":60,"layers":["{\"name\":\"Layer 1\",\"frameCount\":2,\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAA8CAYAAACtrX6oAAABZUlEQVR4nO3cwRHCMAxE0RSUGlIF1TBDMTRAi1BCsCVZK/kf/n0n7xr5+FzXd6fe57lVR/YHBxhggAEGGGCA9yj7gwMMMMAAAwwwwHsEcPOWAR/Px22dgM/367bywP+grsbORl2NHQJsgY2GVoONhnYH9sSNQFbGjUB2A46AjYBWho2AdgFegeuFXAXXC9kMvBLXA7kSrgeyCTgD14pcDdeKDDDAergW5Iq4FuQp4GxYC3JV3FlkgAHWxZ1Brow7gwwwwACrFQacDemBXB13FBlggAFWDGCAAQYYYNkABhhggAGWLQRYFXlk/wiwKvLIfoABBlitUGA15NHto8BqyKPbAQZYF3lm9wywCvLMbv6qLII8uxlggPWQLXstwFnIlr3cJokjW7dyXSiM7LGT+2BBaM99XPiLIXtv440OEeioTbyyk4i9YgfvZDUP4OYB3DyAmwdw8wBuHsDNA7h5ADcP4Ob9AHU/4CXfXtXyAAAAAElFTkSuQmCC\"}"],"expanded":false}}

misc/gif-tests/low-colors-with-transparency.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"low-colors-with-transparency","description":"","fps":12,"height":60,"width":60,"layers":["{\"name\":\"Layer 1\",\"frameCount\":2,\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAA8CAYAAACtrX6oAAABOUlEQVR4nO3bQWoDQQxEUR3Ix8lpAj5MTmovQsNgEmwYdZVG+h9q3+KtO4KIiIiIiIiIiIhoUN9fj7dr1O3n/ng39xvP9wlqI+xPUHtgn4G9IPQZ2OtBZ+JeADkTtzbyDtjC0Dtg60IrcAshK3DrICtxCyArcf3IDlwjsgPXiwxwY2AnrgHZiatHdsOKkd2wemQ3KsAbc4OKkd2gemQ3JsAAZ+bG1AK7IcXIbkg9shsRYIAzcyMCDHBybkSAAc7MjQgwwMm5EQEGODM3oh44oibyxtyQWtwIgAts570AF9jOe39zg4pwV25QLW4EwO2BI2ogC3PDanFXQ3BXs3AjAG4PHMHPhta4qyG4q1m4qyG4q1m4x5rDvjYH9tgQ3NUs3GPNYV+bA/tXTVH/awYqERERERERERFRVk8BxgukicHldgAAAABJRU5ErkJggg==\"}"],"expanded":false}}

misc/icons/SVG/eye.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300"
+   height="140.00085"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="eye.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-6.0052729"
+     inkscape:cy="93.159467"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-223.21875,-469.24915)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 373.21875,469.25 c -63.15236,-0.28299 -150,70 -150,70 0,0 78.75568,70 150,70 62.82091,0 150,-70 150,-70 0,0 -87.47199,-69.71981 -150,-70 z m -1.5,22.3125 c 27.44855,0 49.6875,22.23895 49.6875,49.6875 0,27.44855 -22.23895,49.6875 -49.6875,49.6875 C 344.2702,590.9375 322,568.69855 322,541.25 c 0,-27.44855 22.2702,-49.6875 49.71875,-49.6875 z m 0.0312,18.34375 c -17.85254,0 -32.34375,14.49121 -32.34375,32.34375 0,17.85254 14.49121,32.3125 32.34375,32.3125 17.85254,0 32.3125,-14.45996 32.3125,-32.3125 0,-17.85254 -14.45996,-32.34375 -32.3125,-32.34375 z"
+       id="path2987"
+       inkscape:export-filename="C:\Development\git\piskel\misc\icons\eye.png"
+       inkscape:export-xdpi="28.799999"
+       inkscape:export-ydpi="28.799999"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

misc/icons/SVG/flip.svg

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="770.71875"
+   height="581.4375"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="mirror.svg"
+   inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+   inkscape:export-xdpi="35.446629"
+   inkscape:export-ydpi="35.446629">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="612.40785"
+     inkscape:cy="222.08964"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-63.5625,-233.7818)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 359.2768,233.7907 -295.7143,581.4286 295.7143,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 538.5625,233.7818 295.71875,581.4375 -295.71875,0 0,-581.4375 z m 29.125,117.4375 0,434.28125 218.59375,0 L 567.6875,351.2193 z"
+       id="rect2987-1"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 435.5625,233.93805 0,41.28125 25.71875,0 0,-41.28125 -25.71875,0 z m 0,91.28125 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z"
+       id="rect3796"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

misc/icons/SVG/lasso.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="224.38731"
+   height="177.96065"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.175"
+     inkscape:cx="-1542.2107"
+     inkscape:cy="-1434.6156"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-212.79148,-238.81242)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:30, 30;stroke-dashoffset:0"
+       d="m 429.0234,294.50503 c 0,26.68038 -49.13123,48.3091 -109.73768,48.3091 -60.60644,0 -110.61221,-39.48861 -96.16624,-73.3091 19.3392,-45.27639 60.80353,-4.92189 116.16624,-16.88052 101.16819,-21.85285 89.73768,15.20015 89.73768,41.88052 z"
+       id="path3761"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssss" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 309.32357,338.9218 c 0,0 8.97064,20.56224 -30.34229,45.31736 -39.31294,24.75512 -40.99309,30.13484 -40.99309,30.13484"
+       id="path3764"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czc" />
+  </g>
+</svg>

misc/icons/SVG/onion.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="484.83377"
+   height="430.80322"
+   id="svg3775"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 3">
+  <defs
+     id="defs3777" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.04375"
+     inkscape:cx="-429.81362"
+     inkscape:cy="-202.97901"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata3780">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-108.38875,-334.08796)">
+    <g
+       id="g4409">
+      <g
+         id="g4402" />
+      <g
+         transform="translate(0,0.82903262)"
+         id="g4395">
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 395.27679,333.25893 -27.75,24.625 -1.65625,-9 -15.87054,4.59375 0,30.6875 1.02679,21.75 16.5625,-14.6875 13.6875,-12.15625 c -0.38933,5.52995 -0.57204,11.36571 -0.1875,17.84375 0.60884,10.25666 3.42535,19.47486 9.03125,26.6875 5.6059,7.21264 13.15778,11.83264 21.53125,15.65625 16.74693,7.64722 37.6168,20.19024 63.19196,41.4465 48.42535,40.24771 54.41585,60.33492 63.14228,95.72811 8.30827,46.0064 -4.89609,79.1393 -23.94924,107.24539 -13.61329,20.08154 -30.46397,37.90172 -67.50554,45.41482 -37.04157,7.5131 -71.72672,9.9375 -96.53125,9.9375 l 0,25 c 26.40206,0 62.17269,-2.46078 101.5,-10.4375 39.32731,-7.97672 78.11592,-20.77325 101.8125,-45.5625 25.65093,-26.83371 50.16969,-75.46693 35.5,-151.5 l -0.0312,-0.125 -0.0312,-0.125 c -6.53497,-30.32511 -26.37349,-75.86993 -103.9375,-109.59375 -32.08342,-13.94946 -49.48883,-22.95257 -62.57589,-28.92857 -6.54353,-2.988 -10.31288,-6.85833 -12.36607,-9.5 -2.05319,-2.64167 -3.40095,-5.87935 -3.8125,-12.8125 -0.92607,-15.60085 1.34241,-27.46751 3.71875,-35.3125 2.37634,-7.84499 4.375,-10.875 4.375,-10.875 l -18.875,-16 z"
+           id="path3783-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccsssscssccsscccsssssccc" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 368.02679,382.44643 c 0,0 -18.02679,-4.71234 -18.02679,1.3125 0,33.38646 -0.45698,39.28362 10.99554,62.875 11.45252,23.59138 26.22845,47.86253 48.53571,68.45982 42.18558,38.95183 38.76978,44.87254 45.77232,64.91071 2.57793,7.37689 3.66466,24.51253 1.875,37.96875 -1.78965,13.45623 -6.8081,31.21802 -13.40625,41.3125 -10.36811,15.86211 -18.71831,32.07642 -38.55357,43.09375 C 384.4983,713.88847 366.62548,716.375 350,716.375 l 0,25 c 20.82486,0 44.52967,-5.01706 69.5625,-15.125 25.03283,-10.10794 49.12742,-25.27054 63.71875,-47.59375 9.77369,-14.95272 20.06105,-37.72017 22.33202,-55.91561 2.27097,-18.19544 6.78209,-33.89274 -5.08281,-58.40387 -18.26325,-37.72918 -42.54947,-49.06002 -72.19845,-74.15863 -18.35479,-15.5378 -34.85805,-33.83125 -44.86772,-54.45046 -10.00967,-20.61921 -14.81706,-41.55822 -15.4375,-53.28125 z"
+           id="path3783-9-4-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssszssccssssssc" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="M 364.71429,398.50893 350,399.85268 c 0.74677,14.10988 0,43.14662 0,70.71875 0,13.09078 2.17726,28.99404 4.22321,39.97321 3.9423,21.15552 10.51352,34.8833 14.63393,48.16965 3.27485,10.5598 6.94665,25.34012 9.3884,31.02232 6.61244,15.3878 7.52886,34.1921 0.75446,55.84375 -6.86056,21.92704 -17.55684,42.94479 -35.42857,49.84375 L 350,716.625 c 25.86119,-9.9831 62.03992,-38.1333 71.93512,-69.75936 8.9188,-28.50537 3.28613,-54.26844 -4.84375,-73.1875 -4.92941,-11.47123 -9.61575,-19.37277 -14.86607,-28.9375 -6.46007,-11.76857 -20.1885,-26.52209 -24.11895,-38.53817 -3.57466,-10.92835 -7.82736,-24.14439 -8.92331,-37.66229 -2.1919,-27.03581 -3.63369,-54.77948 -4.46875,-70.03125 z"
+           id="path3783-9-4-4-8-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsssssccsssssc" />
+      </g>
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 306.33447,334.11887 27.75,24.625 1.65625,-9 15.87054,4.59375 0,30.6875 -1.02679,21.75 -16.5625,-14.6875 -13.6875,-12.15625 c 0.38933,5.52995 0.57204,11.36571 0.1875,17.84375 -0.60884,10.25666 0.61526,20.48501 -4.99064,27.69765 -5.6059,7.21264 -12.14763,16.88341 -20.5211,20.70702 -16.74693,7.64722 -36.60664,20.19024 -62.1818,41.4465 -48.42535,40.24771 -47.34479,51.24354 -56.07122,86.63673 -3.25751,47.01655 -5.92183,46.3581 4.75635,78.96112 6.45302,19.70261 22.38275,38.91187 59.42432,56.52649 34.13302,16.23151 85.86885,30.14056 110.67338,30.14056 l 0,25 c -26.40206,0 -62.17269,-2.46078 -101.5,-10.4375 -39.32731,-7.97672 -78.11592,-20.77325 -101.8125,-45.5625 -25.65093,-26.83371 -50.169693,-75.46693 -35.5,-151.5 l 0.0312,-0.125 0.0312,-0.125 c 6.53497,-30.32511 26.37349,-75.86993 103.9375,-109.59375 32.08342,-13.94946 49.48883,-22.95257 62.57589,-28.92857 6.54353,-2.988 10.31288,-6.85833 12.36607,-9.5 2.05319,-2.64167 3.40095,-5.87935 3.8125,-12.8125 0.92607,-15.60085 -1.34241,-27.46751 -3.71875,-35.3125 -2.37634,-7.84499 -4.375,-10.875 -4.375,-10.875 l 18.875,-16 z"
+       id="path3783-2-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccsssscssccsscccsssssccc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 343.97613,380.44701 9.00001,12.77232 c -0.74677,14.10988 0,43.14662 0,70.71875 0,13.09078 3.53703,30.42261 1.49108,41.40178 -3.9423,21.15552 -3.37067,28.45473 -7.49108,41.74108 -3.27485,10.5598 -6.94665,28.91155 -9.3884,34.59375 -6.61244,15.3878 -8.24315,50.62067 -1.46875,72.27232 6.86056,21.92704 11.12828,50.08764 21.85715,66.27232 l 3.98985,41.15013 C 338.24766,729.2435 314.3133,692.32754 304.4181,660.70148 c -8.9188,-28.50537 -8.28613,-78.55416 -0.15625,-97.47322 4.92941,-11.47123 9.61575,-22.9442 14.86607,-32.50893 6.46007,-11.76857 10.13774,-23.49163 13.05804,-36.51786 2.51528,-11.21964 6.93976,-29.49102 8.03571,-43.00892 2.1919,-27.03581 2.9194,-55.49377 3.75446,-70.74554 z"
+       id="path3783-9-4-4-8-8-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsssssccsssssc" />
+  </g>
+</svg>

misc/icons/SVG/swap-colors-sq.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="435"
+   height="409.28125"
+   id="svg3768"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 3">
+  <defs
+     id="defs3770" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="87.95854"
+     inkscape:cy="195.23297"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3773">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-151.0625,-197.71875)">
+    <rect
+       style="fill:none;stroke:#ffffff;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3784"
+       width="400"
+       height="374.28571"
+       x="168.57143"
+       y="215.21933" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 368.5625,209.5 0,97.0625 c -18.16488,0.20304 -36.33513,0.39071 -54.5,0.59375 l 0,-51.1875 c -36.22093,27.13868 -72.43533,54.2988 -108.65625,81.4375 l 107.375,91.46875 1.28125,-53.5 54.5,0.96875 0,62.25 c 20.86255,0.2332 41.73121,0.45431 62.59375,0.6875 l 0,-51.1875 C 467.37718,415.23243 503.59158,442.3613 539.8125,469.5 l -107.40625,91.5 -1.25,-53.5 -62.59375,1.09375 0,75.1875 200,0 0,-365.71875 -200,-8.5625 z"
+       id="path4296"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

misc/icons/SVG/swap-colors.svg

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="305.0015"
+   height="340.10172"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999"
+   sodipodi:docname="swap-colors.svg">
+  <defs
+     id="defs2994" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="8.3838947"
+     inkscape:cy="209.5365"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-253.81175,62.601668)">
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:25;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 281.31983,48.818994 c 3.33333,70.714286 6.66667,141.428566 10,212.142856 61.21871,3.33294 122.57845,5.69263 183.84823,2.1217 15.38711,-0.63513 30.77146,-1.33859 46.15177,-2.1217 3.33333,-70.71429 6.66667,-141.42857 10,-212.142856 -62.39939,12.482847 -126.73342,18.836303 -190.05871,9.668003 -20.08786,-2.492087 -40.09989,-5.6543 -59.94129,-9.668003 z"
+       id="path3907"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
+       inkscape:export-xdpi="28.799999"
+       inkscape:export-ydpi="28.799999" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 261.31983,63.818994 c 0,-10 0,-20 0,-30 17.1189,-42.7715577 62.54009,-66.510405 106.22509,-72.841714 51.17865,-7.022275 108.04464,-2.652241 150.47229,29.6746917 14.38134,11.798678 28.46011,26.7242963 33.30262,44.9943353 0,9.390896 0,18.781791 0,28.172687"
+       id="path3909"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
+       inkscape:export-xdpi="28.799999"
+       inkscape:export-ydpi="28.799999" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:35;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 364.53412,-41.538146 c 25.60486,-3.886191 51.66473,-4.881507 77.20839,0.0707 l 3.09159,0.466979 1.12859,0.176599"
+       id="path3915"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
+       inkscape:export-xdpi="28.799999"
+       inkscape:export-ydpi="28.799999" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 154.55334,129.87795 0.68071,15.85947 c 0,0 -57.346456,21.06263 -57.436416,36.51009 -0.09,15.44746 36.662436,29.96772 55.746256,42.34379 19.08382,12.37606 46.83462,28.70031 47.51123,48.36912 C 200.90809,289.78491 152.86,310.7174 152.86,310.7174 l 0.68319,14.23203 111.11677,-2.02031 11.11168,-206.07112 z"
+       id="path3764"
+       inkscape:connector-curvature="0"
+       transform="translate(253.81175,-62.601668)"
+       sodipodi:nodetypes="cczzcccccc"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\swap.png"
+       inkscape:export-xdpi="28.799999"
+       inkscape:export-ydpi="28.799999" />
+  </g>
+</svg>

misc/icons/noun-project/sheep/icon_8389.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="99.997px" height="69.373px" viewBox="0 0 99.997 69.373" enable-background="new 0 0 99.997 69.373" xml:space="preserve">
+<path fill="#010101" d="M81.635,0.222c0.553-0.327,1.242-0.219,1.85-0.133c1.502,0.296,2.658,1.426,3.533,2.62
+	c0.608-0.379,1.252-0.777,1.983-0.842c0.595-0.015,1.09,0.416,1.394,0.889c0.568,0.909,0.76,2.02,1.442,2.864
+	C92,5.829,92.246,5.941,92.482,6.044c0.968,0.409,1.846,0.996,2.688,1.615c0.361,0.223,0.396,0.691,0.529,1.056
+	c0.478,1.579,0.306,3.241,0.149,4.853c-0.035,0.812-0.104,1.659,0.172,2.438c0.42,0.954,1.229,1.655,1.746,2.547
+	c1.191,2.13,2.146,4.467,2.229,6.937v0.088c-0.071,1.268-0.203,2.647-1.062,3.653c-0.707,0.846-1.85,1.101-2.896,1.223
+	c-0.747,0.104-1.508,0.127-2.258,0.077c-1.912-0.275-3.812-0.628-5.724-0.911c-0.34-0.052-0.719-0.055-1,0.167
+	c-0.391,0.281-0.494,0.786-0.537,1.235c-0.068,1.177,0.133,2.405-0.312,3.532c-0.227,0.604-0.768,0.999-1.266,1.371
+	c-1.092,0.753-2.313,1.291-3.441,1.981c-0.164,0.115-0.125,0.348-0.125,0.521c0.075,0.916,0.332,1.821,0.253,2.747
+	c-0.021,0.597-0.271,1.188-0.72,1.587c-0.768,0.709-1.434,1.519-2.068,2.346c-0.104,0.142-0.222,0.283-0.256,0.461
+	c-0.264,1.272-0.385,2.576-0.74,3.83c-0.201,0.641-0.416,1.34-0.943,1.793c-0.633,0.492-1.456-0.342-2.098,0.164
+	c-1.191,0.882-1.558,2.412-2.379,3.582c-0.469,0.595-1.104,1.039-1.805,1.319c-0.331,4.37-0.625,8.741-0.896,13.115h-5.166
+	c0.16-2.783,0.32-5.567,0.486-8.351c0.203-1.728-0.097-3.444-0.312-5.152c-0.017-0.364-0.43-0.709-0.785-0.543
+	c-1.037,0.3-2.131,0.459-3.204,0.289c-0.87-0.227-1.536-0.877-2.11-1.533c-1.765,1.695-4.326,2.275-6.712,2.025
+	c-0.471-0.726-0.792-1.629-1.603-2.049c-0.539-0.324-1.198-0.155-1.729,0.098c-1.214,0.558-1.945,1.805-3.197,2.305
+	c-1.1,0.51-2.359,0.188-3.41-0.291c-1.127-0.54-2.176-1.242-3.186-1.975c-0.52,0.236-0.837,0.728-1.123,1.195
+	c-0.968,0.117-1.964,0.449-2.923,0.103c-1.548-0.399-2.625-1.652-3.94-2.472c-0.886,0.66-1.608,1.58-2.68,1.957
+	c-0.698,0.24-1.468,0.399-2.196,0.207c-0.825-0.181-1.609-0.5-2.425-0.705c-0.27-0.078-0.558-0.037-0.807,0.082
+	c-1.433,0.646-2.197,2.23-3.688,2.779c-0.307,0.148-0.632,0.043-0.936-0.047c-0.346,3.812-0.79,7.618-1.159,11.43
+	c-1.811,0.006-3.623-0.002-5.434,0.004c-0.078-0.656-0.297-1.312-0.188-1.978c0.27-2.282,0.637-4.551,0.9-6.833
+	c0.181-1.895-0.835-3.648-2.096-4.977c0.154-0.737-0.056-1.502-0.528-2.078c-1.24-1.65-3.362-2.342-4.546-4.043
+	c-0.357-0.53-0.698-1.256-0.328-1.864c0.285-0.724,0.94-1.381,0.769-2.21c-0.04-0.262-0.165-0.502-0.347-0.691
+	c-1.07-1.188-1.971-2.514-2.849-3.844c-0.403-0.59-0.372-1.338-0.438-2.02c-0.141-1.194,0.732-2.201,0.798-3.364
+	c-0.196-0.665-0.84-1.073-1.192-1.654C0.638,31.785,0.077,30.231,0,28.62v-0.446c0.086-0.751,0.078-1.537,0.396-2.239
+	c0.522-1.006,1.566-1.623,2.075-2.636c-0.222-0.968-0.747-1.833-0.966-2.799c-0.097-1.466,0.425-2.955,1.404-4.049
+	c0.664-0.035,1.319-0.157,1.968-0.296c0.633-0.125,1.1-0.631,1.448-1.145c0.703-1.045,0.832-2.351,1.479-3.422
+	c0.255-0.444,0.607-0.855,1.08-1.074c0.692-0.327,1.395-0.631,2.119-0.88c0.38-0.117,0.779-0.237,1.18-0.167
+	c0.894,0.134,1.771,0.361,2.665,0.5c0.624,0.088,1.321-0.085,1.74-0.58c0.379-0.424,0.483-1.003,0.574-1.544
+	c0.926-0.306,1.929-0.646,2.907-0.389c1.367,0.311,2.72,0.672,4.091,0.96c0.748-0.367,1.104-1.208,1.849-1.582
+	c0.884-0.481,1.947-0.333,2.873-0.064c1.13,0.322,1.991,1.168,3.041,1.655c0.735-0.438,1.304-1.316,2.246-1.275
+	c1.698,0.444,3.091,1.803,4.899,1.868c1.229,0.001,1.779-1.354,2.912-1.594c0.744-0.228,1.496,0.125,2.104,0.54
+	c0.745,0.517,1.432,1.11,2.132,1.684c1.052-0.622,2.251-1.085,3.492-1.026c1.448,0.261,2.847,0.754,4.294,1.011
+	c0.615-0.026,0.967-0.649,1.489-0.902c1.062-0.497,2.237-0.755,3.409-0.756c1.316,0.169,2.543,0.712,3.82,1.042
+	c0.623-0.171,1.135-0.659,1.803-0.686c1.026-0.025,2.055-0.006,3.08-0.008c0.401-0.321,0.769-0.709,1.26-0.9
+	c0.869-0.37,1.744-0.836,2.703-0.898c0.994,0.08,1.975,0.287,2.964,0.402c0.235-1.401,0.842-2.703,1.481-3.958
+	c1.241-0.227,2.463-0.58,3.66-0.973C80.409,1.51,80.956,0.784,81.635,0.222z"/>
+</svg>

misc/icons/noun-project/sheep/license.txt

@@ -0,0 +1,8 @@
+Thank you for using The Noun Project. This icon is licensed under Creative
+Commons Attribution and must be attributed as:
+
+    Sheep by Unrecognized MJ from The Noun Project
+
+If you have a Premium Account or have purchased a license for this icon, you
+don't need to worry about attribution! We will share the profits from your
+purchase with this icon's designer.

misc/icons/noun-project/undo-kyle_levi_fox/icon_10033.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="89.231px" height="100px" viewBox="0 0 89.231 100" enable-background="new 0 0 89.231 100" xml:space="preserve">
+<path d="M14.652,64.026c-0.603-2.09-1-4.267-1.15-6.511H0c0.18,3.858,0.86,7.586,1.962,11.13L14.652,64.026z"/>
+<path d="M14.332,88.192l8.684-10.35c-2.899-2.792-5.273-6.127-6.926-9.857L3.402,72.604C5.9,78.563,9.655,83.87,14.332,88.192z"/>
+<path d="M42.483,86.499c-6.051-0.409-11.626-2.559-16.245-5.943l-8.681,10.346c6.985,5.336,15.582,8.661,24.926,9.099V86.499z"/>
+<path d="M44.589,10.768V0L14.266,17.506l30.323,17.506V24.245c17.186,0,31.166,13.98,31.166,31.165  c0,16.477-12.854,29.999-29.061,31.087v13.502C70.337,98.896,89.231,79.32,89.231,55.41C89.231,30.794,69.205,10.768,44.589,10.768z  "/>
+</svg>

misc/icons/noun-project/undo-kyle_levi_fox/license.txt

@@ -0,0 +1,8 @@
+Thank you for using The Noun Project. This icon is licensed under Creative
+Commons Attribution and must be attributed as:
+
+    Undo by Kyle Levi Fox from The Noun Project
+
+If you have a Premium Account or have purchased a license for this icon, you
+don't need to worry about attribution! We will share the profits from your
+purchase with this icon's designer.

misc/scripts/build-mac-application.txt

@@ -0,0 +1,12 @@
+01 - Run grunt desktop on mac os x
+02 - Retrieve piskel.new.dmg.zip on Dropbox. Unzip it.
+03 - Retrieve nw.icns on Dropbox
+04 - Go to piskel/dest/desktop/releases/mac ; copy piskel.app to your working directory
+05 - Expand piskel.app
+06 - Replace nw.icns by the one from dropbox in Contents/Resources
+07 - Open piskel.new.dmg
+08 - Drag and drop piskel.app in it
+09 - Update readme.txt
+10 - Open disk utility, and open piskel.new.dmg in it
+11 - Convert image, piskel-x.y.z.dmg
+12 - Upload to Dropbox

misc/scripts/change-windows-icon.cmd

@@ -1,16 +0,0 @@
-setlocal
-@echo off
-
-pushd ..\..
-set PISKEL_HOME=%cd%
-popd
-
-echo "Updating Piskel icon"
-
-ResHacker -addoverwrite "%PISKEL_HOME%\dest\desktop\releases\windows\piskel.exe", "%PISKEL_HOME%\dest\desktop\releases\windows\piskel-release.exe", "%PISKEL_HOME%\src\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
-
-pause
-
-explorer "%PISKEL_HOME%\dest\desktop\releases\windows"
-
-endlocal

misc/scripts/copy-to-piskel-website.cmd

@@ -0,0 +1,21 @@
+@ECHO off
+
+SETLOCAL
+
+  SET PISKEL_PATH="C:\Development\git\piskel"
+  SET PISKELAPP_PATH="C:\Development\git\piskel-website"
+
+  ECHO "Copying files to piskelapp"
+  XCOPY "%PISKEL_PATH%\dest\prod" "%PISKELAPP_PATH%\static\editor" /e /i /h /y
+
+  ECHO "Delete previous partial"
+  DEL "%PISKELAPP_PATH%\templates\editor\main-partial.html"
+  ECHO "Copy new partial"
+  MOVE "%PISKELAPP_PATH%\static\editor\piskelapp-partials\main-partial.html" "%PISKELAPP_PATH%\templates\editor"
+  ECHO "Delete temp partial"
+  RMDIR "%PISKELAPP_PATH%\static\editor\piskelapp-partials\" /S /Q
+
+  PAUSE
+  explorer "%PISKELAPP_PATH%\"
+
+ENDLOCAL

misc/scripts/package-windows-executable.cmd

@@ -6,40 +6,17 @@ SETLOCAL
   set PISKEL_HOME=%cd%
   POPD
 
-  set VBOX_PATH="C:\Program Files (x86)\Enigma Virtual Box"
   set RESOURCE_HACKER_PATH="C:\Program Files (x86)\Resource Hacker"
 
-  set APP_BIN="%PISKEL_HOME%\dest\desktop\cache\win\0.9.2"
   set MISC_FOLDER=%PISKEL_HOME%\misc
-  set RELEASES_FOLDER=%PISKEL_HOME%\dest\desktop\releases
-  set DEST_FOLDER=%RELEASES_FOLDER%\win
-
-  ECHO "Building Piskel executable for Windows ..."
-
-  ECHO "Creating release directory ..."
-    MKDIR "%DEST_FOLDER%"
-  ECHO "DONE"
-
-  ECHO "Packaging executable ..."
-    COPY /b "%APP_BIN%\nw.exe"+"%RELEASES_FOLDER%\piskel\piskel.nw" "%DEST_FOLDER%\piskel-raw.exe"
-  ECHO "DONE"
-
-  ECHO "COPYing dependencies ..."
-    COPY "%APP_BIN%\*.dll" "%DEST_FOLDER%\"
-    COPY "%APP_BIN%\nw.pak" "%DEST_FOLDER%\"
-  ECHO "DONE"
+  set RELEASES_FOLDER=%PISKEL_HOME%\dest\desktop
+  set DEST_FOLDER=%RELEASES_FOLDER%\piskel\win32
 
   ECHO "Updating Piskel icon -- Using Resource Hacker"
-    %RESOURCE_HACKER_PATH%\ResHacker -addoverwrite "%DEST_FOLDER%\piskel-raw.exe", "%DEST_FOLDER%\piskel-exploded.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
-    DEL "%DEST_FOLDER%\piskel-raw.exe"
+    %RESOURCE_HACKER_PATH%\ResHacker -addoverwrite "%DEST_FOLDER%\piskel.exe", "%DEST_FOLDER%\piskel-logo.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
+    DEL "%DEST_FOLDER%\piskel.exe"
   ECHO "DONE"
 
-  ECHO "Boxing application to single file -- Using Enigma Virtual Box"
-    %VBOX_PATH%\enigmavbconsole "%MISC_FOLDER%\desktop\package-piskel.evb"
-    DEL "%DEST_FOLDER%\*.dll"
-    DEL "%DEST_FOLDER%\nw.pak"
-    DEL "%DEST_FOLDER%\piskel-exploded.exe"
-  ECHO "DONE"
 
   PAUSE
   explorer "%DEST_FOLDER%\"

misc/scripts/piskel-root

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+// Writes the absolute path to the release build root to stdout
+var path = require('path');
+process.stdout.write(path.resolve(__dirname, '../../dest/prod') + '\n');

misc/selenium-ide/change-colors.html

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:9901/?debug" />
+<title>change-colors</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">change-colors</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/?debug</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.sp-preview-inner</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=input.sp-input</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>css=input.sp-input</td>
+	<td>rgb(170, 187, 204)</td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>id=preview-list-scroller</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.swap-colors-icon</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

misc/selenium-ide/change-size.html

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:9901/?debug" />
+<title>change-size</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">change-size</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/?debug</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.tool-icon.resize-icon</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>name=resize-width</td>
+	<td>64</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>name=resize-height</td>
+	<td>64</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>name=resize-content-checkbox</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>//input[@value='Resize']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>id=column-wrapper</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

misc/selenium-ide/select-tools.html

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:9901/?debug" />
+<title>Select tools</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Select tools</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/?debug</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[3]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[4]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[5]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[6]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[7]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[8]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[9]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[10]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[11]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[12]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseDown</td>
+	<td>//ul[@id='tools-container']/li[13]</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

misc/selenium-ide/user-preferences.html

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:9901/?debug" />
+<title>user-preferences</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">user-preferences</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/?debug</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.tool-icon.gear-icon</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.background-picker.lowcont-medium-picker-background</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.background-picker.medium-picker-background</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=div.background-picker.light-picker-background</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=grid-width</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=grid-width</td>
+	<td>label=Enabled - 1px wide</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=option[value=&quot;1&quot;]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=grid-width</td>
+	<td>label=Enabled - 2px wide</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=option[value=&quot;2&quot;]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=grid-width</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=grid-width</td>
+	<td>label=Enabled - 3px wide</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=option[value=&quot;3&quot;]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=grid-width</td>
+	<td>label=Enabled - 4px wide</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>css=option[value=&quot;4&quot;]</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

package.json

@@ -1,34 +1,57 @@
 {
-  "author": "Julian Descottes, Vincent Renaudin",
   "name": "piskel",
-  "main": "./dest/index.html",
-  "description": "Web based 2d animations editor",
-  "version": "0.1.0",
+  "version": "0.8.0",
+  "description": "Pixel art editor",
+  "author": "Julian Descottes <julian.descottes@gmail.com>",
+  "contributors": [
+    "Vincent Renaudin"
+  ],
   "homepage": "http://github.com/juliandescottes/piskel",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/juliandescottes/piskel.git"
   },
+  "files": [
+    "dest/prod",
+    "misc/scripts/piskel-root"
+  ],
+  "bin": {
+    "piskel-root": "./misc/scripts/piskel-root"
+  },
+  "main": "./dest/prod/index.html",
   "scripts": {
     "test": "grunt test",
-    "start": "nodewebkit"
+    "start": "nodewebkit",
+    "preversion": "grunt test-local build",
+    "postversion": "git push && git push --tags && npm publish"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-connect": "0.3.0",
-    "grunt-contrib-concat": "0.1.2",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-jshint": "0.5.4",
-    "grunt-contrib-uglify": "0.2.2",
-    "grunt-contrib-watch": "0.6.1",
-    "grunt-express": "1.0",
-    "grunt-ghost": "1.0.12",
+    "dateformat": "1.0.11",
+    "grunt": "^0.4.5",
+    "grunt-contrib-clean": "1.0.0",
+    "grunt-contrib-concat": "1.0.1",
+    "grunt-contrib-connect": "1.0.2",
+    "grunt-contrib-copy": "1.0.0",
+    "grunt-contrib-jshint": "1.0.0",
+    "grunt-contrib-uglify": "1.0.1",
+    "grunt-contrib-watch": "1.0.0",
+    "grunt-ghost": "1.1.0",
+    "grunt-include-replace": "4.0.1",
+    "grunt-jscs": "2.8.0",
+    "grunt-karma": "1.0.0",
+    "grunt-leading-indent": "0.2.0",
+    "grunt-nw-builder": "2.0.3",
     "grunt-open": "0.2.3",
-    "grunt-leading-indent": "0.1.0",
-    "grunt-closure-tools": "~0.8.3",
-    "grunt-node-webkit-builder": "0.1.19",
-    "nodewebkit": "0.8.4"
+    "grunt-replace": "1.0.1",
+    "grunt-spritesmith": "6.3.0",
+    "jasmine-core": "2.1.0",
+    "karma": "0.13.21",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-jasmine": "1.0.2",
+    "karma-phantomjs-launcher": "0.2.3",
+    "load-grunt-tasks": "3.5.0",
+    "phantomjs": "1.9.19"
   },
   "window": {
     "title": "Piskel",

src/css/animations.css

@@ -0,0 +1,3 @@
+@keyframes fade {
+  50% { opacity: 0.5; }
+}

src/css/bootstrap/bootstrap.css

@@ -36,7 +36,7 @@
 }
 .tooltip {
   position: absolute;
-  z-index: 1030;
+  z-index: 30000;
   display: block;
   visibility: visible;
   padding: 5px;

src/css/cheatsheet.css

@@ -1,108 +0,0 @@
-.cheatsheet-link {
-  position: fixed;
-  bottom: 10px;
-  left: 10px;
-
-  padding: 1px 0 0 45px;
-  color : gold;
-  font-weight: bold;
-  font-size : 1.25em;
-  line-height: 20px;
-
-  cursor : pointer;
-
-  background-image:url('../img/keyboard.png');
-  background-size:35px 20px;
-  background-repeat:no-repeat;
-  opacity: 0.5;
-  z-index: 11000;
-  transition : opacity 0.3s;
-}
-
-.cheatsheet-link:hover {
-  opacity: 1;
-}
-
-#cheatsheet-wrapper {
-  position: absolute;
-  z-index: 10000;
-
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-
-  padding: 50px;
-
-  box-sizing: border-box;
-  -moz-box-sizing : border-box;
-
-  color: white;
-}
-
-.cheatsheet-container {
-  width: 100%;
-  height:  100%;
-
-  box-sizing: border-box;
-  -moz-box-sizing : border-box;
-
-  padding: 20px 3%;
-  border-radius: 3px;
-  background: rgba(0,0,0,0.9);
-  overflow: auto;
-}
-
-.cheatsheet-container h3 {
-  font-size:24px;
-  margin-top: 0;
-}
-
-.cheatsheet-section {
-  float: left;
-  width : 33%;
-}
-
-.cheatsheet-shortcut {
-  overflow: hidden;
-  margin: 10px 0;
-}
-
-.cheatsheet-icon.tool-icon {
-  float: left;
-  display: inline-block;
-
-  height: 30px;
-  width: 30px;
-  margin: 0 20px 0 0;
-
-  background-size: 20px 20px;
-  background-position: 5px 5px;
-}
-
-.cheatsheet-description {
-  font-family:Courier;
-  color: white;
-  font-size : 13px;
-  margin-left: 20px;
-  line-height : 30px;
-}
-
-.cheatsheet-key {
-  display : inline-block;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 10px;
-
-  border : 1px solid gold;
-  border-radius: 2px;
-
-  box-sizing: border-box;
-  -moz-box-sizing : border-box;
-
-  text-align: center;
-  font-family:Courier;
-  font-weight: bold;
-  font-size : 18px;
-  color: gold;
-}

src/css/color-picker-slider.css

@@ -0,0 +1,105 @@
+.color-picker-slider * {
+  box-sizing: border-box;
+}
+
+.color-picker-slider input[type="range"] {
+  -webkit-appearance: none;
+  -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+  width: 100%;
+  border: none;
+  padding: 1px 2px;
+  border-radius: 3px;
+  background-image: linear-gradient(to right, hsl(0, 30%, 70%) 0, hsl(359, 30%, 70%) 100%);
+  box-shadow: inset 0 1px 0 0 #0d0e0f, inset 0 -1px 0 0 #3a3d42;
+  outline: none; /* no focus outline */
+}
+
+/* thumb */
+
+.color-picker-slider input[type="range"]::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  cursor:pointer;
+  width: 7px;
+  height: 18px;
+  border: none;
+  border-radius: 2px;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #529de1), color-stop(100%, #245e8f)); /* android <= 2.2 */
+  background-image: -webkit-linear-gradient(top , #529de1 0, #245e8f 100%); /* older mobile safari and android > 2.2 */;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+.color-picker-slider input[type="range"]::-moz-range-thumb {
+  width: 7px;
+  height: 18px;
+  border: none;
+  border-radius: 2px;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+
+.color-picker-slider input[type="range"]::-ms-thumb {
+  width: 7px;
+  height: 18px;
+  border-radius: 2px;
+  border: 0;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+
+/*CROSS BROWSER RESET*/
+
+
+.color-picker-slider input[type="range"]::-moz-range-track {
+  border: inherit;
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-track {
+  border: inherit;
+  color: transparent; /* don't drawn vertical reference line */
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-fill-lower,
+.color-picker-slider input[type="range"]::-ms-fill-upper {
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-tooltip {
+  display: none;
+}
+
+.color-picker-slider,
+.color-picker-input {
+  padding: 0 10px;
+  height : 25px;
+  overflow: hidden;
+}
+
+.color-picker-slider span{
+  line-height : 25px;
+  width : 10px;
+  float:left;
+}
+
+.color-picker-slider input[type="range"]{
+  float:left;
+  height : 10px;
+  width : 100px;
+  margin: 7px 1px 7px 8px;
+}
+
+.color-picker-slider input[type="text"]{
+  float:left;
+  width : 47px;
+  margin-left: 5px;
+}
+
+.color-picker-input {
+  margin-bottom: 10px;
+}
+
+.color-picker-input .textfield{
+  width:100%;
+}
+
+.color-picker-slider input[type="range"][data-dimension="h"] {
+  background-image:linear-gradient(to right, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+}

src/css/dialogs-browse-local.css

@@ -0,0 +1,38 @@
+
+/************************************************************************************************/
+/* Browse local piskels panel                                                                   */
+/************************************************************************************************/
+
+.local-piskel-list {
+  width: 100%;
+}
+
+.local-piskel-item {
+  height: 3em;
+}
+
+.local-piskel-name {
+  width: 40%;
+}
+
+.local-piskel-save-date {
+  font-weight : normal;
+}
+
+.local-piskel-list a {
+  text-decoration: none;
+}
+
+.local-piskel-list a:hover {
+  text-decoration: underline;
+}
+
+.local-piskel-list-head {
+  font-weight: bold;
+  color: gold;
+}
+
+.local-piskel-load-button,
+.local-piskel-delete-button {
+  width : 75px;
+}

src/css/dialogs-cheatsheet.css

@@ -0,0 +1,227 @@
+.cheatsheet-link {
+  position: fixed;
+  bottom: 10px;
+  left: 10px;
+
+  color : gold;
+  font-weight: bold;
+  font-size : 1.25em;
+  line-height: 20px;
+
+  cursor: pointer;
+
+  opacity: 0.5;
+  z-index: 11000;
+  transition : opacity 0.3s;
+}
+
+.cheatsheet-link:hover {
+  opacity: 1;
+}
+
+.cheatsheet-container {
+  box-sizing: border-box;
+  display: block;
+
+  bottom: 46px;
+  padding: 20px 3%;
+  border-radius: 3px;
+  background-color: rgba(0,0,0,0.9);
+  overflow: auto;
+}
+
+.cheatsheet-container .cheatsheet-title {
+  font-size:24px;
+  margin-top: 30px;
+}
+
+.cheatsheet-container .cheatsheet-title:nth-of-type(1) {
+  margin-top: 0;
+}
+
+.cheatsheet-section {
+  box-sizing: border-box;
+  float: left;
+
+  vertical-align: top;
+  padding : 0 20px 20px 20px;
+  min-width: 300px;
+}
+
+.cheatsheet-boxes {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+
+  float: left;
+}
+
+@media (min-width: 1300px) {
+  .cheatsheet-container > div {
+    width: 33%;
+  }
+  .cheatsheet-boxes {
+    flex-direction: column;
+  }
+}
+
+.cheatsheet-shortcut {
+  overflow: hidden;
+  margin: 10px 0;
+}
+
+.cheatsheet-icon.tool-icon {
+  float: left;
+
+  height: 30px;
+  width: 30px;
+  margin: 0 10px 0 0;
+  background-size: 30px 30px;
+}
+
+.cheatsheet-description {
+  color: white;
+  font-size : 14px;
+  margin-left: 10px;
+  line-height : 30px;
+}
+
+.cheatsheet-key {
+  box-sizing: border-box;
+  display : inline-block;
+  height: 30px;
+  line-height: 26px;
+  padding: 0 10px;
+
+  border : 2px solid white;
+  border-radius: 2px;
+
+  text-align: center;
+  font-family:Courier;
+  font-weight: bold;
+  font-size : 18px;
+  color: white;
+}
+
+.cheatsheet-shorcut-conflict .cheatsheet-key {
+  border-color: red;
+  color: red;
+}
+
+.cheatsheet-shortcut-editable {
+  cursor : pointer;
+}
+
+.cheatsheet-shortcut-editable .cheatsheet-key {
+  border-color: gold;
+  color: gold;
+}
+
+.cheatsheet-shortcut-editing .cheatsheet-key {
+  animation: fade .5s infinite;
+}
+
+.cheatsheet-shortcut-undefined .cheatsheet-key {
+  border-color: red;
+  color: red;
+}
+
+/*Cheatsheet actions*/
+
+.cheatsheet-actions {
+  position: absolute;
+  box-sizing: border-box;
+
+  bottom : 0;
+  left : 0;
+  right : 0;
+  height : 46px;
+
+  padding : 10px;
+  overflow: hidden;
+
+  background-color : gold;
+}
+
+.cheatsheet-helptext {
+  font-size: 14px;
+  height : 26px;
+  line-height : 26px;
+  color: black;
+}
+
+.cheatsheet-helptext-tooltip {
+  text-align: left;
+}
+
+.cheatsheet-helptext-tooltip-item {
+  line-height: 0.9em;
+  margin: 10px 0;
+}
+
+.cheatsheet-button {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+
+
+.cheatsheet-icon-tool-circle {
+  background-image: url(../img/icons/tools/tool-circle.png);
+}
+
+.cheatsheet-icon-tool-colorpicker {
+  background-image: url(../img/icons/tools/tool-colorpicker.png);
+}
+
+.cheatsheet-icon-tool-colorswap {
+  background-image: url(../img/icons/tools/tool-colorswap.png);
+}
+
+.cheatsheet-icon-tool-dithering {
+  background-image: url(../img/icons/tools/tool-dithering.png);
+}
+
+.cheatsheet-icon-tool-eraser {
+  background-image: url(../img/icons/tools/tool-eraser.png);
+}
+
+.cheatsheet-icon-tool-lasso-select {
+  background-image: url(../img/icons/tools/tool-lasso-select.png);
+}
+
+.cheatsheet-icon-tool-lighten {
+  background-image: url(../img/icons/tools/tool-lighten.png);
+}
+
+.cheatsheet-icon-tool-move {
+  background-image: url(../img/icons/tools/tool-move.png);
+}
+
+.cheatsheet-icon-tool-paint-bucket {
+  background-image: url(../img/icons/tools/tool-paint-bucket.png);
+}
+
+.cheatsheet-icon-tool-pen {
+  background-image: url(../img/icons/tools/tool-pen.png);
+}
+
+.cheatsheet-icon-tool-rectangle-select {
+  background-image: url(../img/icons/tools/tool-rectangle-select.png);
+}
+
+.cheatsheet-icon-tool-rectangle {
+  background-image: url(../img/icons/tools/tool-rectangle.png);
+}
+
+.cheatsheet-icon-tool-shape-select {
+  background-image: url(../img/icons/tools/tool-shape-select.png);
+}
+
+.cheatsheet-icon-tool-stroke {
+  background-image: url(../img/icons/tools/tool-stroke.png);
+}
+
+.cheatsheet-icon-tool-vertical-mirror-pen {
+  background-image: url(../img/icons/tools/tool-vertical-mirror-pen.png);
+}

src/css/dialogs-create-palette.css

@@ -0,0 +1,169 @@
+#dialog-container.create-palette {
+  width: 500px;
+  height: 600px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -250px;
+}
+
+.show #dialog-container.create-palette {
+  margin-top: -300px;
+}
+
+.create-palette-section {
+  position: absolute;
+  left: 10px;
+  top: 50px;
+}
+
+.create-palette-import-section {
+  display : inline-block;
+}
+
+.colors-container {
+  position: absolute;
+
+  left: 10px;
+  right: 10px;
+  top: 85px;
+
+  height: 460px;
+
+  border: 1px solid black;
+  background: #333;
+}
+
+.color-picker-container {
+  position:absolute;
+  left : 280px;
+  top:0;
+  bottom:0;
+  right:0;
+  background: #222;
+}
+
+.create-palette-actions {
+  position: absolute;
+  box-sizing: border-box;
+
+  width:100%;
+  height: 45px;
+
+  left: 0;
+  right: 0;
+  bottom: 0;
+
+  padding:10px;
+  text-align:right;
+}
+
+.color-preview {
+  width: 170px;
+  height: 70px;
+  margin: 11px;
+}
+
+.colors-list {
+  overflow: auto;
+  width: 280px;
+  box-sizing: border-box;
+  height: 100%;
+  padding-bottom: 10px;
+}
+
+.create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+  position:relative;
+  float : left;
+
+  width : 44px;
+  height : 44px;
+  margin : 10px 0 0 10px;
+
+  box-sizing : border-box;
+
+  cursor : pointer;
+}
+
+@-moz-document url-prefix() {
+  .create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+    margin : 7px 0 0 7px;
+  }
+}
+
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+    margin : 7px 0 0 7px;
+  }
+}
+
+
+.create-palette-color {
+  border:1px solid #2c2c2c;
+  transition : border-color 0.2s;
+}
+.create-palette-color:hover {
+  border:1px solid gold;
+}
+
+.colors-list-drop-proxy {
+  border:2px dotted #eee;
+}
+
+.create-palette-new-color {
+  border:2px dotted gold;
+
+  border-radius: 2px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 20px;
+  color: gold;
+}
+
+.create-palette-color.selected {
+  border:2px solid gold;
+}
+
+.create-palette-remove-color {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 2px 4px 0 0;
+  opacity : 0.2;
+
+  font-weight: bold;
+  color: rgb(255,255,255);
+  text-shadow : 0 0 1px rgb(0,0,0);
+
+  transition : opacity 0.3s, color 0.1s;
+}
+
+.light-color .create-palette-remove-color {
+  color: rgb(0,0,0);
+  text-shadow : 0 0 1px rgb(255,255,255);
+}
+
+.selected .create-palette-remove-color {
+  top: -1px;
+  right: -1px;
+}
+
+.create-palette-color:hover .create-palette-remove-color {
+  opacity: 0.6;
+}
+
+.create-palette-color .create-palette-remove-color:hover {
+  opacity: 1;
+  color: rgb(240,80,80);
+  text-shadow : 0 0 1px rgb(0,0,0);
+}
+
+/*SPECTRUM OVERRIDES*/
+
+.create-palette .sp-container{
+  background-color: transparent;
+  border: none;
+  box-shadow : none;
+  border-radius:0;
+  padding:5px;
+}

src/css/dialogs-import-image.css

@@ -0,0 +1,101 @@
+/************************************************************************************************/
+/* Import dialog                                                                                 */
+/************************************************************************************************/
+
+#dialog-container.import-image {
+  width: 550px;
+  height: 360px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -250px;
+}
+
+.show #dialog-container.import-image {
+  margin-top: -150px;
+}
+
+.import-subsection {
+  margin-left: 25px;
+}
+
+.import-section:not(.import-subsection) > .dialog-section-title {
+  width: 50px;
+}
+
+.import-section-preview-title {
+  position: absolute;
+  margin-left: 50%;
+  margin-top: -28px;
+}
+
+.import-section-preview {
+  position: absolute;
+  display: inline-block;
+  border: 1px dashed #999;
+  border-radius: 3px;
+  margin-left: 50%;
+}
+
+.import-section-preview img {
+  max-width: 220px;
+  max-height: 220px;
+  display: block;
+}
+
+.import-section-preview.no-border {
+  border-color: transparent;
+}
+
+.import-section-preview canvas {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.dialog-section-title {
+  display : inline-block;
+  width: 80px;
+}
+
+.dialog-section-radio {
+  margin-top: 15px;
+  vertical-align: sub;
+}
+
+.import-size-field:nth-of-type(2) {
+  margin-left: 5px;
+}
+
+.import-image-file-name {
+  display: inline-block;
+  overflow: hidden;
+
+  width: 200px;
+  vertical-align: middle;
+
+  word-break : break-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  font-style: italic;
+  font-weight: normal;
+  text-shadow: none;
+  color: gold;
+}
+
+[name=smooth-resize-checkbox] {
+  margin : 0 8px;
+}
+
+.dialog-import-body {
+  padding: 10px 20px;
+  font-size:1.3em
+}
+
+.import-button {
+  font-size: 1em;
+  height: 28px;
+  padding: 0px 10px;
+  margin-top: 15px;
+}

src/css/dialogs-manage-palettes.css

@@ -1,222 +0,0 @@
-.palette-manager-wrapper {
-  height: 100%;
-  position: relative;
-}
-
-.palette-manager-body {
-  position: absolute;
-  top: 45px;
-  bottom: 0;
-  right: 0;
-  left: 0;
-}
-
-.palette-manager-head {
-  position: absolute;
-  width: 100%;
-  background: gold;
-  margin: 0;
-  padding: 10px;
-  color: black;
-  font-size: 1.8em;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-.palette-manager-close {
-  position: absolute;
-  top: 0;
-  right: 0;
-  line-height: 45px;
-  margin-right: 10px;
-  font-size: 1.3em;
-  cursor: pointer;
-}
-
-.palette-manager-drawer {
-  width: 200px;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-}
-
-.palette-manager-list {
-  position: absolute;
-  top:40px;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-}
-
-.palette-manager-actions {
-  position: absolute;
-  height:40px;
-  line-height:40px;
-  width: 100%;
-  text-align: center;
-}
-
-.palette-manager-actions-button {
-  width: 80px;
-  margin: 5px;
-}
-
-.palette-manager-palette-button,
-.palette-manager-actions-button {
-  line-height: 20px;
-}
-
-.palette-manager-list li {
-  height: 48px;
-  line-height: 48px;
-  padding-left:10px;
-
-  font-size: 1.4em;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-
-  border-bottom: 1px solid #666;
-  cursor:pointer;
-}
-
-.palette-manager-list li:hover {
-  background : #222;
-}
-
-.palette-manager-list li.selected {
-  color : gold;
-  font-weight: bold;
-}
-
-.palette-manager-list li:nth-child(1) {
-  border-top: 1px solid #666;
-}
-
-.palette-manager-details {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 200px;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-
-  border-left:1px solid #666;
-}
-
-.palette-manager-details-head {
-  position: absolute;
-  height:40px;
-  line-height:40px;
-  width: 100%;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-.palette-manager-details-head-name {
-  padding: 0 10px 0 20px;
-  font-size: 1.5em;
-  font-weight: bold;
-}
-
-.palette-manager-details-head .edit-icon {
-  width: 24px;
-  display: inline-block;
-  background-size: 16px;
-}
-
-.palette-manager-details-head-actions {
-  float: right;
-  line-height: 40px;
-  padding-right: 10px;
-}
-
-.palette-manager-details-body {
-  position: absolute;
-  top:40px;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-
-
-.palette-manager-color-card {
-  width: 120px;
-  height: 180px;
-  display: inline-block;
-  position: relative;
-  margin: 20px 0 20px 20px;
-  box-shadow: 0 0 0px 0px gold;
-  transition: box-shadow 0.3s;
-}
-
-.palette-manager-color-card:hover {
-  box-shadow: 0 0 4px 1px gold;
-}
-
-.palette-manager-delete-card {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 20px;
-
-  text-align: center;
-  font-size: 1.6em;
-  font-weight: bold;
-  color: rgb(255,255,255);
-  text-shadow : 0 0 2px rgb(0,0,0);
-  cursor: pointer;
-
-  opacity : 0.2;
-  transition : opacity 0.3s, color 0.1s;
-}
-
-.palette-manager-color-card:hover .palette-manager-delete-card {
-  opacity : 0.6;
-}
-
-.palette-manager-color-card .palette-manager-delete-card:hover {
-  opacity : 1;
-  color: rgb(240,80,80);
-}
-
-.palette-manager-new-color .palette-manager-color-square {
-  border: 3px dotted #888;
-  border-bottom-width: 0;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  border-radius: 3px 3px 0 0;
-  cursor: pointer;
-  text-align: center;
-  font-size: 24px;
-  color: #888;
-  line-height: 120px;
-}
-
-.palette-manager-color-square {
-  width: 120px;
-  height: 120px;
-  cursor: pointer;
-  /*background-image:url(../img/tools/eyedropper.png);*/
-}
-
-.palette-manager-color-details {
-  color : #666;
-  background: #eee;
-  height: 60px;
-  padding-left: 5px;
-}
-
-.palette-manager-color-details li{
-  line-height: 20px;
-  font-weight: bold;
-}

src/css/dialogs.css

@@ -17,16 +17,16 @@
   opacity: 0;
   pointer-events: none;
 
-  transition: opacity 0.5s;
-
-
   color: white;
 }
 
+#dialog-container-wrapper.animated {
+  transition: opacity 0.2s;
+}
+
 #dialog-container-wrapper.show {
   opacity: 1;
   pointer-events: auto;
-  transition: opacity 0.5s;
 }
 
 #dialog-container {
@@ -34,13 +34,13 @@
   height:  100%;
 
   margin-top: -1500px;
-  transition:margin-top 0.5s;
 
   box-sizing: border-box;
   -moz-box-sizing : border-box;
 
   border-radius: 3px;
-  background: rgba(0,0,0,1);
+  border : 3px solid gold;
+  background: #444;
   overflow: auto;
 }
 
@@ -48,3 +48,50 @@
   margin-top: 0;
 }
 
+#dialog-container.browse-local {
+  width: 700px;
+  height: 500px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -350px;
+}
+
+.show #dialog-container.browse-local {
+  margin-top: -250px;
+}
+
+.dialog-wrapper {
+  height: 100%;
+  position : relative;
+}
+
+.dialog-content {
+  position: absolute;
+  top: 45px;
+  bottom: 0;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.dialog-head {
+  width: 100%;
+  background: gold;
+  margin: 0;
+  padding: 10px;
+  color: black;
+  font-size: 1.8em;
+  height: 45px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+
+.dialog-close {
+  position: absolute;
+  top: 0;
+  right: 0;
+  line-height: 45px;
+  margin-right: 10px;
+  font-size: 1.3em;
+  cursor: pointer;
+}

src/css/font-icon.css

@@ -0,0 +1,96 @@
+@font-face {
+  font-family: 'piskel';
+  src:url('fonts/icomoon.eot?-3olv93');
+  src:url('fonts/icomoon.eot?#iefix-3olv93') format('embedded-opentype'),
+    url('fonts/icomoon.woff?-3olv93') format('woff'),
+    url('fonts/icomoon.ttf?-3olv93') format('truetype'),
+    url('fonts/icomoon.svg?-3olv93#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+[class^="piskel-icon-"], [class*=" piskel-icon-"] {
+  font-family: 'piskel';
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.piskel-icon-eye:before {
+  content: "\e602";
+}
+
+.piskel-icon-onion:before {
+  content: "\e601";
+}
+
+.piskel-icon-download:before {
+  content: "\e600";
+}
+
+.piskel-icon-rotateleft:before {
+  content: "\e603";
+}
+
+.piskel-icon-rotateright:before {
+  content: "\e604";
+}
+
+.piskel-icon-fliph:before {
+  content: "\e605";
+}
+
+.piskel-icon-flipv:before {
+  content: "\e606";
+}
+
+.piskel-icon-trashplain:before {
+  content: "\e607";
+}
+
+.piskel-icon-trash:before {
+  content: "\e608";
+}
+
+.piskel-icon-merge:before {
+  content: "\e609";
+}
+
+.piskel-icon-pencil:before {
+  content: "\e610";
+}
+
+.piskel-icon-close:before {
+  content: "\e611";
+}
+
+.piskel-icon-minus:before {
+  content: "\e60a";
+}
+
+.piskel-icon-plus:before {
+  content: "\e60b";
+}
+
+.piskel-icon-arrow-up-fat:before {
+  content: "\e60c";
+}
+
+.piskel-icon-arrow-down-fat:before {
+  content: "\e60d";
+}
+
+.piskel-icon-arrow-up-thin:before {
+  content: "\e60e";
+}
+
+.piskel-icon-arrow-down-thin:before {
+  content: "\e60f";
+}

src/css/fonts/icomoon.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M256 192l128 128h-96v128h-64v-128h-96zM372.363 244.364l-35.87-35.871 130.040-48.493-210.533-78.509-210.533 78.509 130.040 48.493-35.871 35.871-139.636-52.364v-128l256-96 256 96v128z" />
+<glyph unicode="&#xe601;" d="M327.755 416.174l-24.759-21.971-1.481 8.030-14.159-4.099v-27.379l0.914-19.404 26.988 23.949c-0.347-4.934-0.51-10.141-0.166-15.921 0.543-9.151 3.055-17.374 8.057-23.811s11.74-10.557 19.211-13.967c14.942-6.822 33.56-18.012 56.377-36.978 43.203-35.907 48.548-53.828 56.334-85.404 7.412-41.045-4.368-70.606-21.368-95.68-12.144-17.918-27.179-33.815-60.225-40.518s-63.992-8.866-86.123-8.866v-22.304c23.555 0 55.469 2.195 90.553 9.313s69.693 18.531 90.832 40.649c22.885 23.941 44.76 67.328 31.672 135.162l-0.055 0.223c-5.829 27.055-23.529 67.689-92.729 97.775-28.624 12.445-44.153 20.477-55.829 25.809-5.837 2.666-9.197 6.119-11.030 8.475s-3.034 5.246-3.401 11.43c-0.827 13.918 1.198 24.507 3.318 31.505s3.904 9.702 3.904 9.702l-16.84 14.276zM303.444 372.291c0 0-16.082 4.204-16.082-1.173 0-29.786-0.407-35.048 9.808-56.095s23.399-42.701 43.302-61.078c37.637-34.753 34.591-40.033 40.837-57.911 2.3-6.582 3.27-21.87 1.673-33.875s-6.074-27.851-11.959-36.856c-9.25-14.152-16.702-28.62-34.395-38.447-18.488-10.269-34.432-12.486-49.265-12.486v-22.304c18.579 0 39.728 4.476 62.060 13.494s43.831 22.548 56.848 42.462c8.719 13.341 17.897 33.653 19.924 49.887s6.051 30.237-4.534 52.106c-16.294 33.661-37.961 43.77-64.413 66.162-16.375 13.863-31.099 30.183-40.029 48.578s-13.219 37.077-13.772 47.536zM300.488 357.961l-13.128-1.2c0.667-12.589 0-38.494 0-63.093 0-11.679 1.942-25.867 3.768-35.663 3.517-18.873 9.378-31.122 13.056-42.974 2.921-9.421 6.195-22.61 8.376-27.676 5.897-13.728 6.717-30.505 0.674-49.822-6.121-19.563-15.663-38.313-31.608-44.469l5.736-18.915c23.072 8.907 55.35 34.019 64.177 62.238 7.959 25.431 2.932 48.415-4.32 65.295-4.397 10.236-8.579 17.284-13.263 25.818-5.764 10.5-18.011 23.661-21.517 34.382-3.19 9.75-6.983 21.54-7.96 33.601-1.955 24.118-3.242 48.871-3.986 62.479zM248.405 416.148l24.758-21.971 1.481 8.029 14.159-4.099v-27.379l-0.914-19.403-26.988 23.949c0.347-4.933 0.51-10.141 0.166-15.92-0.543-9.152 0.548-18.276-4.452-24.711s-10.838-15.063-18.308-18.475c-14.942-6.823-32.661-18.010-55.476-36.978-43.203-35.907-42.239-45.718-50.025-77.294-2.905-41.947-5.284-41.359 4.244-70.447 5.757-17.579 19.97-34.716 53.016-50.429 30.453-14.481 76.609-26.889 98.737-26.889v-22.304c-23.555 0-55.469 2.195-90.553 9.309s-69.692 18.531-90.832 40.649c-22.885 23.94-44.76 67.329-31.671 135.162l0.055 0.223c5.829 27.055 23.529 67.689 92.731 97.775 28.623 12.445 44.153 20.477 55.826 25.808 5.839 2.665 9.197 6.119 11.034 8.474s3.034 5.246 3.401 11.43c0.827 13.918-1.198 24.507-3.318 31.505s-3.903 9.702-3.903 9.702l16.84 14.274zM281.987 374.814l8.031-11.395c-0.667-12.589 0-38.494 0-63.093 0-11.68 3.154-27.141 1.329-36.938-3.517-18.873-3.009-25.387-6.684-37.239-2.921-9.421-6.195-25.794-8.376-30.864-5.897-13.728-7.354-45.161-1.31-64.478 6.121-19.563 9.928-44.689 19.498-59.125l3.56-36.712c-21.161 28.662-42.512 61.597-51.342 89.814-7.958 25.431-7.393 70.082-0.139 86.961 4.398 10.236 8.578 20.472 13.263 29.004 5.764 10.5 9.043 20.958 11.649 32.578 2.245 10.010 6.192 26.31 7.168 38.372 1.955 24.121 2.604 49.509 3.351 63.117z" horiz-adv-x="576" />
+<glyph unicode="&#xe602;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
+<glyph unicode="&#xe603;" d="M256 448c-70.692 0-134.688-28.66-181.016-74.989l-74.984 74.989v-192h192l-71.766 71.761c34.748 34.746 82.746 56.239 135.766 56.239 106.034 0 192-85.962 192-192 0-57.348-25.146-108.818-65.009-144l42.333-48c53.151 46.908 86.676 115.538 86.676 192 0 141.385-114.615 256-256 256z" />
+<glyph unicode="&#xe604;" d="M0 192c0-76.462 33.524-145.092 86.675-192l42.333 48c-39.863 35.182-65.008 86.652-65.008 144 0 106.038 85.965 192 192 192 53.021 0 101.019-21.493 135.765-56.239l-71.765-71.761h192v192l-74.985-74.989c-46.327 46.329-110.322 74.989-181.015 74.989-141.385 0-256-114.615-256-256z" />
+<glyph unicode="&#xe605;" d="M0 288h512v192zM512 0v192h-512z" />
+<glyph unicode="&#xe606;" d="M288 480v-512h192zM0-32h192v512z" />
+<glyph unicode="&#xe607;" d="M96-32h320l32 352h-384zM320 416v64h-128v-64h-160v-96l32 32h384l32-32v96h-160zM288 416h-64v32h64v-32z" />
+<glyph unicode="&#xe608;" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" />
+<glyph unicode="&#xe609;" d="M448 224h-80l-112-112-112 112h-80l-64-128v-32h512v32l-64 128zM0 32h512v-32h-512v32zM288 320v128h-64v-128h-112l144-144 144 144h-112z" />
+<glyph unicode="&#xe60a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
+<glyph unicode="&#xe60b;" d="M496 288h-176v176c0 8.836-7.164 16-16 16h-96c-8.836 0-16-7.164-16-16v-176h-176c-8.836 0-16-7.164-16-16v-96c0-8.836 7.164-16 16-16h176v-176c0-8.836 7.164-16 16-16h96c8.836 0 16 7.164 16 16v176h176c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16z" />
+<glyph unicode="&#xe60c;" d="M256.001 480l-256.001-256h160v-255.999l192-0.001v256h160z" />
+<glyph unicode="&#xe60d;" d="M256-32l256 256h-160v255.999l-192 0.001v-256h-160z" />
+<glyph unicode="&#xe60e;" d="M438.627 278.627l-160 160c-12.496 12.497-32.757 12.497-45.254 0l-160-160c-12.497-12.497-12.497-32.758 0-45.255 12.497-12.498 32.758-12.498 45.255 0l105.372 105.373v-306.745c0-17.673 14.327-32 32-32s32 14.327 32 32v306.745l105.373-105.373c6.248-6.248 14.438-9.372 22.627-9.372s16.379 3.124 22.627 9.373c12.497 12.497 12.497 32.757 0 45.254z" />
+<glyph unicode="&#xe60f;" d="M73.373 169.373l160-160c12.496-12.497 32.758-12.497 45.255 0l160 160c12.496 12.497 12.496 32.758 0 45.255-12.497 12.497-32.758 12.497-45.255 0l-105.373-105.373v306.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-306.745l-105.373 105.373c-6.248 6.248-14.438 9.372-22.627 9.372s-16.379-3.124-22.627-9.372c-12.497-12.497-12.497-32.758 0-45.255z" />
+<glyph unicode="&#xe610;" d="M432 480c44.182 0 80-35.817 80-80 0-18.010-5.955-34.629-16-48l-32-32-112 112 32 32c13.371 10.045 29.989 16 48 16zM32 112l-32-144 144 32 296 296-112 112-296-296zM357.789 298.211l-224-224-27.578 27.578 224 224 27.578-27.578z" />
+<glyph unicode="&#xe611;" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" />
+</font></defs></svg>

src/css/fonts/piskel.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M548.568 479.997c-230.956 1.035-548.568-255.999-548.568-255.999s288.019-255.998 548.568-255.998c229.744 0 548.568 255.999 548.568 255.999s-319.896 254.974-548.568 255.999zM543.082 398.397c100.382 0 181.713-81.33 181.713-181.713s-81.331-181.713-181.713-181.713c-100.382 0-181.827 81.331-181.827 181.713s81.445 181.713 181.827 181.713zM543.197 331.312c-65.289 0-118.285-52.996-118.285-118.285s52.996-118.171 118.285-118.171c65.289 0 118.17 52.882 118.17 118.171s-52.882 118.285-118.17 118.285z" horiz-adv-x="1097" />
+<glyph unicode="&#xe601;" d="M333.139 442.196l-28.111-24.945-1.682 9.117-16.077-4.654v-31.086l1.038-22.032 30.642 27.192c-0.394-5.602-0.579-11.514-0.189-18.076 0.616-10.389 3.469-19.727 9.148-27.036s13.329-11.986 21.812-15.858c16.965-7.745 38.105-20.45 64.012-41.986 49.053-40.769 55.122-61.117 63.962-96.969 8.416-46.603-4.959-80.166-24.261-108.637-13.789-20.344-30.859-38.395-68.38-46.004s-72.657-10.067-97.784-10.067v-25.324c26.745 0 62.98 2.493 102.815 10.574s79.13 21.041 103.132 46.154c25.984 27.183 50.821 76.445 35.96 153.464l-0.063 0.253c-6.619 30.719-26.716 76.854-105.285 111.015-32.5 14.131-50.132 23.25-63.389 29.304-6.628 3.027-10.442 6.947-12.524 9.622s-3.445 5.956-3.862 12.978c-0.939 15.803 1.36 27.825 3.767 35.771s4.432 11.015 4.432 11.015l-19.12 16.209zM305.535 392.371c0 0-18.259 4.773-18.259-1.332 0-33.82-0.462-39.793 11.136-63.691s26.568-48.483 49.166-69.349c42.733-39.459 39.275-45.454 46.367-65.753 2.611-7.473 3.713-24.832 1.899-38.462s-6.896-31.623-13.579-41.846c-10.502-16.069-18.963-32.495-39.053-43.653-20.991-11.659-39.094-14.177-55.936-14.177v-25.324c21.094 0 45.108 5.082 70.464 15.322s49.766 25.601 64.546 48.212c9.899 15.147 20.321 38.209 22.622 56.641s6.87 34.332-5.148 59.162c-18.5 38.219-43.101 49.697-73.135 75.121-18.592 15.74-35.31 34.27-45.45 55.156s-15.009 42.098-15.636 53.973zM302.18 376.1l-14.906-1.362c0.757-14.293 0-43.707 0-71.637 0-13.26 2.204-29.37 4.278-40.492 3.993-21.428 10.649-35.336 14.823-48.794 3.317-10.697 7.035-25.671 9.51-31.424 6.695-15.587 7.627-34.636 0.765-56.569-6.95-22.212-17.785-43.502-35.888-50.49l6.513-21.476c26.197 10.113 62.845 38.626 72.867 70.666 9.036 28.875 3.329 54.971-4.906 74.137-4.993 11.622-9.74 19.624-15.059 29.314-6.544 11.921-20.45 26.866-24.431 39.038-3.621 11.070-7.929 24.458-9.038 38.151-2.22 27.384-3.681 55.489-4.526 70.94zM243.043 442.167l28.111-24.945 1.682 9.117 16.077-4.654v-31.086l-1.038-22.031-30.642 27.192c0.394-5.601 0.579-11.514 0.189-18.076-0.616-10.391 0.623-20.75-5.055-28.057s-12.305-17.102-20.787-20.976c-16.965-7.747-37.083-20.449-62.988-41.986-49.053-40.769-47.959-51.909-56.799-87.761-3.299-47.627-5.999-46.959 4.819-79.986 6.537-19.959 22.674-39.417 60.195-57.258 34.577-16.442 86.982-30.531 112.107-30.531v-25.324c-26.745 0-62.98 2.493-102.815 10.57s-79.129 21.041-103.132 46.154c-25.983 27.182-50.821 76.447-35.959 153.464l0.063 0.253c6.618 30.719 26.715 76.854 105.288 111.015 32.499 14.131 50.131 23.25 63.386 29.302 6.629 3.026 10.442 6.948 12.528 9.622s3.445 5.956 3.862 12.978c0.939 15.803-1.36 27.825-3.767 35.771s-4.431 11.015-4.431 11.015l19.12 16.207zM281.173 395.236l9.119-12.938c-0.757-14.293 0-43.707 0-71.637 0-13.261 3.582-30.816 1.509-41.939-3.993-21.428-3.416-28.824-7.589-42.282-3.317-10.697-7.035-29.287-9.51-35.043-6.695-15.587-8.351-51.277-1.488-73.21 6.95-22.212 11.272-50.74 22.139-67.131l4.043-41.683c-24.026 32.543-48.269 69.938-58.294 101.975-9.036 28.875-8.394 79.572-0.158 98.736 4.993 11.622 9.74 23.244 15.059 32.931 6.544 11.922 10.268 23.796 13.227 36.99 2.548 11.365 7.031 29.873 8.139 43.568 2.22 27.387 2.957 56.213 3.804 71.663z" horiz-adv-x="576" />
+<glyph unicode="&#xe602;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
+</font></defs></svg>

src/css/forms.css

@@ -3,14 +3,19 @@
 }
 
 .textfield {
+  box-sizing:border-box;
+
   background : black;
   border : 1px solid #888;
   border-radius : 2px;
   padding : 3px 10px;
   color : white;
 
-  box-sizing:border-box;
-  -moz-box-sizing:border-box;
+  height: 23px;
+}
+
+.textfield[readonly="true"] {
+  background: transparent;
 }
 
 .textfield[disabled=disabled] {
@@ -22,8 +27,8 @@
 }
 
 .button {
-  height: 24px;
   box-sizing: border-box;
+  height: 24px;
 
   background-color: #3f3f3f;
   border: 1px solid #333;
@@ -34,7 +39,7 @@
   text-decoration: none;
 
   color: white;
-  text-shadow: 0px -1px 0 black;
+  text-shadow: 0 -1px 0 black;
   font-weight: bold;
   font-size: 1rem;
   text-align: center;
@@ -56,7 +61,7 @@
   border-bottom-color: rgb(151, 133, 0);
 
   color: black;
-  text-shadow: 0px 1px 0 #fff;
+  text-shadow: 0 1px 0 #fff;
 }
 
 .button-primary:hover {
@@ -69,8 +74,16 @@
   cursor:default;
   background-color: #aaa;
   color: #777;
-  text-shadow: 0px 1px 0 #bbb;
+  text-shadow: 0 1px 0 #bbb;
   border-color: #666;
   border-top-color: #999;
   border-bottom-color: #555;
+}
+
+.import-size-field,
+.resize-size-field,
+.export-size-field  {
+  width: 50px;
+  margin-right: 8px;
+  text-align: right;
 }

src/css/frames-list.css

@@ -23,11 +23,11 @@
   -o-transition: all 500ms ease-out;
   transition: all 500ms ease-out;
 
-  background-image: linear-gradient(45deg, rgba(0,0,0, 0.8) 25%, transparent 25%, transparent 75%, rgba(0,0,0, 0.8) 75%, rgba(0,0,0, 0.8)),
-                    linear-gradient(-45deg, rgba(0,0,0, 0.8) 25%, transparent 25%, transparent 75%, rgba(0,0,0, 0.8) 75%, rgba(0,0,0, 0.8));
-  background-size: 29px 45px;
+  background-image: linear-gradient(45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D),
+                    linear-gradient(-45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D);
+  background-size: 30px 40px;
   background-repeat: repeat-x;
-  background-position-x: 3px;
+  background-position: 3px 0;
   z-index: 10;
 }
 
@@ -37,8 +37,7 @@
 
 .bottom-overflow {
   bottom: -20px;
-  background-position-x: 0;
-  background-position-y: -23px;
+  background-position: 3px -20px;
 }
 
 .top-overflow-visible .top-overflow {
@@ -51,28 +50,32 @@
 
 .preview-list {
   list-style-type: none;
-  padding-right: 7px;
+  padding-right: 9px;
 }
 
 .add-frame-action {
-  border: #888 solid 4px;
-  font-size: 13px;
-  color: #888;
-  cursor: pointer;
-  padding: 6px 0;
-  border-radius: 4px;
   margin-top: 8px;
-  background-image: url(../img/plus.png);
-  background-repeat: no-repeat;
-  background-position: 3px 7px;
-  background-size: 26px 26px;
-  text-indent: 18px;
+  padding: 6px 0;
+  overflow: hidden;
+  width: 96px;
+
+  border: #888 solid 3px;
+  border-radius: 4px;
+
+  color: #888;
   background-color: #222;
+  font-size: 13px;
+  cursor: pointer;
+}
+
+.add-frame-action-icon {
+  margin: 3px;
+  float: left;
 }
 
 .add-frame-action .label {
-  width: 80px;
-  margin: 0 auto;
+  overflow: hidden;
+  text-align: left;
 }
 
 .add-frame-action:hover {
@@ -96,6 +99,10 @@
   border: #999 3px solid;
 }
 
+.tile-view {
+  position : relative;
+}
+
 .preview-tile .tile-overlay {
   z-index: 10;
   position: absolute;
@@ -125,15 +132,9 @@
 }
 
 .preview-tile .tile-overlay.delete-frame-action {
-   background-image: url(../img/garbage.png);
-   background-repeat: no-repeat;
    top: 0;
    right: 0;
    border-bottom-left-radius: 3px;
-   height: 30px;
-   width: 30px;
-   background-position: 5px 5px;
-   background-size: 20px;
    cursor: pointer;
 }
 
@@ -141,10 +142,6 @@
    bottom: 0;
    right: 0;
    border-bottom-left-radius: 3px;
-   background-image: url(../img/duplicate.png);
-   background-repeat: no-repeat;
-   background-position: 5px 5px;
-   background-size: 20px;
    cursor: pointer;
 }
 
@@ -152,10 +149,6 @@
    bottom: 0;
    left: 0;
    border-top-right-radius: 3px;
-   background-image: url(../img/dragndrop.png);
-   background-repeat: no-repeat;
-   background-position: 5px 5px;
-   background-size: 20px;
    cursor: move;
 }
 
@@ -164,13 +157,13 @@
 }
 
 .preview-tile.selected:after {
-  content: " ";
+  content: "";
   position: absolute;
   top: 38px;
-  right: -15px;
+  right: -9px;
   border: transparent 4px solid;
   border-left-color: gold;
-  border-width: 6px;
+  border-width: 6px 0 6px 6px;
   border-style: solid;
 }
 
@@ -181,7 +174,5 @@
 
 .preview-tile-drop-proxy {
   border: 3px dashed gold;
-  height: 90px;
-  border-radius: 9px;
   background-color: rgba(255, 215,0, 0.2);
 }

src/css/icons.css

@@ -1,10 +0,0 @@
-.action-icon {
-  cursor: pointer;
-  height: 100%;
-  background-repeat: no-repeat;
-  background-position: 50%;
-}
-
-.action-icon.edit-icon {
-  background-image: url('../img/tools/pen.png');
-}

src/css/layout.css

@@ -0,0 +1,158 @@
+/**
+ * Application layout
+ */
+
+.main-wrapper {
+  position: absolute;
+  top: 5px;
+  right: 0;
+  bottom: 5px;
+  left: 0;
+}
+
+.column-wrapper {
+  text-align: center;
+  font-size: 0;
+  display: flex;
+
+  position: absolute;
+  left: 100px; /* Reserve room for tools on the left edge of the screen. */
+  top: 0;
+  right: 50px; /* Reserve room for actions on the right edge of the screen. */
+  bottom: 0;
+}
+
+.left-column {
+  vertical-align: top;
+  height: 100%;
+  margin-right: 7px;
+}
+
+.main-column {
+  height: 100%;
+  position: relative;
+}
+
+.right-column {
+  box-sizing: border-box;
+  vertical-align: top;
+  height: 100%;
+
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+  margin-left: 10px;
+  /* Add some padding for the absolutely positioned .cursor-coordinates */
+  padding-bottom: 20px;
+}
+
+.drawing-canvas-container {
+  font-size: 0;
+}
+
+.sticky-section {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.sticky-section .sticky-section-wrap {
+  display: table;
+  height: 100%;
+}
+
+.sticky-section .vertical-centerer {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+.left-sticky-section.sticky-section {
+  left: 0;
+  max-width: 100px;
+}
+
+.left-sticky-section .tool-icon {
+  float: left;
+}
+
+.cursor-coordinates {
+  color:#888;
+  font-size:12px;
+  font-weight:bold;
+  font-family:Courier;
+}
+
+/**
+ * Canvases layout
+ */
+
+.canvas {
+  position: relative;
+  z-index: 1;
+}
+
+.canvas-container {
+  position: relative;
+  display: block;
+}
+
+.canvas-container .canvas-background {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.light-picker-background,
+.light-canvas-background .canvas-background {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEXf39////8zI3BgAAAAHklEQVR4AWNghAIGCMDgjwgFCDDSw2M0PSCD0fQAACRcAgF4ciGUAAAAAElFTkSuQmCC') repeat;
+}
+
+.medium-picker-background,
+.medium-canvas-background .canvas-background {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEW6urr///82MBGFAAAAHUlEQVR4AWOAAUYoQOePEAUj3v9oYDQ9gMBoegAAJFwCAbLaTIMAAAAASUVORK5CYII=') repeat;
+}
+
+.lowcont-medium-picker-background,
+.lowcont-medium-canvas-background .canvas-background {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEXV1dXb29tFGkCIAAAAHklEQVR4AWNghAIGCMDgjwgFCDDSw2M0PSCD0fQAACRcAgF4ciGUAAAAAElFTkSuQmCC') repeat;
+}
+
+.lowcont-dark-picker-background,
+.lowcont-dark-canvas-background .canvas-background {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEVMTExVVVUnhsEkAAAAHUlEQVR4AWOAAUYoQOePEAUj3v9oYDQ9gMBoegAAJFwCAbLaTIMAAAAASUVORK5CYII=') repeat;
+}
+
+.canvas.onion-skin-canvas {
+  opacity: 0.2;
+}
+
+.canvas.canvas-overlay,
+.canvas.layers-canvas,
+.canvas.onion-skin-canvas {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tools-wrapper,
+.options-wrapper,
+.palette-wrapper {
+  float : left;
+}
+
+/**
+ * Z-indexes should match the drawing area canvas superposition order :
+ * - 1 : draw layers below current layer
+ * - 2 : draw current layer
+ * - 3 : draw layers above current layer
+ * - 4 : draw the tools overlay
+ */
+.canvas.layers-below-canvas  {z-index:  7;}
+.canvas.drawing-canvas       {z-index:  8;}
+.canvas.canvas-overlay       {z-index:  9;}
+.canvas.onion-skin-canvas    {z-index:  10;}
+.canvas.layers-above-canvas  {z-index:  11;}

src/css/notifications.css

@@ -0,0 +1,74 @@
+.user-message {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  padding: 10px 47px;
+  max-width: 300px;
+
+  border-top-left-radius: 7px;
+  border: #F0C36D 1px solid;
+  border-right: 0;
+  border-bottom: 0;
+
+  color: #222;
+  background-color: #F9EDBE;
+
+  font-weight: bold;
+  font-size: 13px;
+
+  z-index: 30000;
+}
+
+.user-message .close {
+  position: absolute;
+  top: 6px;
+  right: 17px;
+
+  color: gray;
+
+  font-size: 18px;
+  font-weight: bold;
+
+  cursor: pointer;
+}
+
+.user-message .close:hover {
+  color: black;
+}
+
+.progress-bar-container {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  padding: 10px;
+  width: 360px;
+  border-top-right-radius: 2px;
+  border: gold 2px solid;
+  border-left: 0;
+  border-bottom: 0;
+  background-color: #444;
+  font-size: 14px;
+  z-index: 30000;
+  color: #eee;
+}
+
+.progress-bar-item {
+  float: left;
+  height:20px;
+}
+
+.progress-bar-status {
+  line-height: 20px;
+  width : 40px;
+  overflow : hidden;
+  margin: 0 0 0 10px;
+}
+
+.progress-bar {
+  border : 1px solid grey;
+  margin-top: 8px;
+  height : 4px;
+  width : 300px;
+  background : linear-gradient(to left, gold, gold) no-repeat -300px 0;
+  background-color : black;
+}

src/css/pensize.css

@@ -0,0 +1,49 @@
+.pen-size-container {
+  overflow: hidden;
+  padding: 5px 5px;
+}
+
+.pen-size-option {
+  float: left;
+  box-sizing: border-box;
+  width: 20px;
+  height: 20px;
+  margin-right: 2px;
+  border-style: solid;
+  border-width: 2px;
+  border-color: #444;
+  cursor: pointer;
+}
+
+.pen-size-option[data-size='1'] {
+  padding: 6px;
+}
+.pen-size-option[data-size='2'] {
+  padding: 5px;
+}
+.pen-size-option[data-size='3'] {
+  padding: 4px;
+}
+.pen-size-option[data-size='4'] {
+  padding: 3px;
+}
+
+.pen-size-option:before {
+  content: '';
+  width: 100%;
+  height: 100%;
+  background-color: white;
+  display: block;
+}
+
+.pen-size-option:hover {
+  border-color: #888;
+}
+
+.pen-size-option.selected:before {
+  background-color: gold;
+}
+
+.pen-size-option.selected {
+  border-color: gold;
+}

src/css/reset.css

@@ -3,7 +3,7 @@ html, body {
   margin : 0;
   overflow: hidden;
   cursor : default;
-  font-family: arial;
+  font-family: Arial;
   font-size: 11px;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
@@ -19,6 +19,17 @@ ul, li {
   list-style-type: none;
 }
 
+/** Firefox overrides this with -moz-use-system-font */
+button,
+input,
+input[type="submit"] {
+  font-family: Arial;
+}
+
+/* IE11 applies a big default margin for range inputs */
+input[type="range"] {
+  padding: 0;
+}
 
 /* Force apparition of scrollbars on leopard */
 ::-webkit-scrollbar {
@@ -33,4 +44,8 @@ ul, li {
 
 ::-webkit-scrollbar-track {
    background-color: rgba(50, 50, 50, 0.4);
+}
+
+a, a:visited {
+  color:gold;
 }

src/css/settings-application.css

@@ -0,0 +1,57 @@
+/*******************************/
+/*  Application Setting panel  */
+/*******************************/
+
+.background-picker-wrapper {
+  display: inline-block;
+  width: 130px;
+  overflow: hidden;
+  vertical-align: middle;
+  margin-left: 5px;
+}
+
+.background-picker {
+  cursor: pointer;
+  float: left;
+  height: 14px;
+  width: 14px;
+  background-color: transparent;
+  margin-right: 5px;
+  padding: 1px;
+  position: relative;
+  border: #888 2px solid;
+}
+
+.background-picker:hover {
+  border-color: #eee;
+}
+
+.background-picker.selected {
+  border-color: gold;
+}
+
+.layer-opacity-input {
+  margin: 5px;
+  vertical-align: middle;
+  width: 100px;
+}
+
+.layer-opacity-text {
+  height: 31px;
+  display: inline-block;
+  line-height: 30px;
+  width: 40px;
+  border: 1px solid grey;
+  box-sizing: border-box;
+  border-radius: 3px;
+  text-align: center;
+}
+
+.grid-width-select {
+  margin: 5px 5px 0 5px;
+}
+
+.settings-section-application > .settings-title {
+  /* Override the default 10px margin bottom for this panel */
+  margin-bottom: 15px;
+}

src/css/settings-export.css

@@ -1,35 +1,46 @@
-
+/*******************************/
 /* Gif/Png Export Setting panel*/
 /*******************************/
-.gif-upload-button,
+.gif-download-button,
 .gif-render-button {
-  /*float : right;*/
   margin-top : 10px;
   margin-right : 10px;
 }
 
-.gif-export-radio-group {
-  margin:10px 0;
-}
-
 .gif-export-preview,
 .png-export-preview {
-  margin-top:20px;
-  max-width:240px;
   position:relative;
+  margin-top:10px;
+  max-height:32px;
 }
 
-.png-export-preview {
-  margin:10px 0;
-  overflow: hidden;
+.gif-export-preview {
+  max-width:32px;
 }
 
 .png-export-preview img {
+  max-height:32px;
   float: left;
 }
 
-.png-upload-status {
-  margin : 10px 0;
+.png-export-preview .light-picker-background {
+  max-width:240px;
+}
+
+.gif-upload-status {
+  width: 180px;
+  margin-left: 5px;
+  margin-top: 10px;
+}
+
+.gif-upload,
+.png-export-preview {
+  overflow: hidden;
+}
+
+.gif-upload-status,
+.gif-export-preview {
+  float : left;
 }
 
 .preview-upload-ongoing:before{
@@ -44,4 +55,129 @@
   -moz-box-sizing:border-box;
   background: rgba(0,0,0,0.5);
   color: white;
-}
+}
+
+.export-scale {
+  margin-bottom: 10px;
+}
+
+.export-scale .scale-input {
+  margin: 5px;
+  vertical-align: middle;
+  width: 150px;
+}
+
+.export-scale .scale-text {
+  height: 31px;
+  display: inline-block;
+  line-height: 30px;
+  width: 40px;
+  border: 1px solid grey;
+  box-sizing: border-box;
+  border-radius: 3px;
+  text-align: center;
+}
+
+.export-resize {
+  margin: 10px 0;
+  overflow: hidden;
+}
+
+.export-resize > * {
+  float: left;
+}
+
+.export-resize > *:not(:last-child) {
+  margin-right: 10px;
+}
+
+.export-resize > .resize-field {
+  width: 70px;
+}
+
+.export-resize > .resize-label {
+  height: 23px;
+  line-height: 23px;
+}
+
+.export-tabs {
+  overflow: hidden;
+  position: relative;
+}
+
+.export-tabs:after {
+  content: "";
+  display: block;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 1px;
+  z-index: 0;
+  background-color: gold;
+}
+
+.export-tab {
+  float: left;
+  cursor: pointer;
+  padding: 5px;
+  border: 1px solid transparent;
+  /* Make sure the tab and its border are positioned above the :after element; */
+  position: relative;
+  z-index: 1;
+}
+
+.export-tab.selected,
+.export-tab:hover {
+  color: gold;
+}
+
+.export-tab.selected {
+  border-color: gold gold #444 gold;
+  border-style: solid;
+  border-width: 1px;
+}
+
+.export-panel-header {
+  padding: 10px 5px 0px;
+}
+
+.export-info {
+  font-style: italic;
+  text-shadow: none;
+  font-weight: normal;
+}
+
+.export-panel-section {
+  padding: 5px;
+  margin-top: 10px;
+  border: 1px solid #5d5d5d;
+  border-radius: 2px;
+}
+
+.export-panel-row {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+}
+
+.export-panel-gif .button {
+  margin-right: 5px;
+  width: 75px;
+  flex-shrink: 0;
+}
+
+.export-panel-png .textfield {
+  width: 50px;
+}
+
+.png-export-dimension-info,
+.png-export-datauri-info {
+  margin-left: 5px;
+}
+
+#png-export-columns,
+#png-export-rows {
+  /* Override default textfield padding-right to keep the number spinners
+     aligned to the right. */
+  padding-right: 0;
+}

src/css/settings-import.css

@@ -0,0 +1,18 @@
+/************************************************************************************************/
+/* Import panel                                                                                 */
+/************************************************************************************************/
+
+.import-section,
+.resize-section {
+  margin: 10px 0;
+}
+
+.file-input-button {
+  margin-right: 8px;
+  border-radius: 2px;
+}
+
+.import-highlight {
+  font-weight: bold;
+  color: white;
+}

src/css/settings-resize.css

@@ -0,0 +1,107 @@
+.resize-section-title {
+  vertical-align: top;
+  display: inline-block;
+  padding-top: 5px;
+  width: 25%;
+}
+
+/*****************/
+/* ANCHOR WIDGET */
+/*****************/
+
+.resize-origin-container {
+  overflow: hidden;
+  position: relative;
+  width: 70px;
+  margin-top: 5px;
+  display: inline-block;
+}
+
+.transition .resize-origin-option,
+.transition .resize-origin-option:before {
+  transition: background-color 0.2s, border-color 0.2s;
+}
+
+.resize-origin-option {
+  float: left;
+  position: relative;
+
+  box-sizing: border-box;
+  margin: 0 1px 1px 0;
+  width: 20px;
+  height: 20px;
+
+  background : #888;
+
+  font-size: 8px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.disabled .resize-origin-option {
+  cursor: default;
+  background : #555;
+  border-color: #555 !important;
+}
+
+.resize-origin-option:hover {
+  border : 3px solid white;
+}
+
+.resize-origin-option.selected {
+  border : 3px solid gold;
+}
+
+.resize-origin-option:before {
+  content: '';
+  position: absolute;
+  display: block;
+  top: 50%;
+  left: 50%;
+  margin: -2px;
+}
+
+.resize-origin-option.selected:before {
+  content: '';
+  width: 4px;
+  height: 4px;
+  background: gold;
+}
+
+.disabled .resize-origin-option.selected:before {
+  background: #555;
+}
+
+.disabled .resize-origin-option[data-neighbor]:before {
+  border-color: #555 !important;
+}
+
+.resize-origin-option[data-neighbor]:before {
+  width: 0;
+  height: 0;
+  border-width: 4px;
+  border-style: solid;
+  border-color: transparent;
+}
+
+.resize-origin-option[data-neighbor="bottom"]:before {
+  border-top-color: gold;
+  margin-left: -4px;
+}
+
+.resize-origin-option[data-neighbor="left"]:before {
+  border-right-color: gold;
+  margin-top: -4px;
+  margin-left: -6px;
+}
+
+.resize-origin-option[data-neighbor="top"]:before {
+  border-bottom-color: gold;
+  margin-top: -6px;
+  margin-left: -4px;
+}
+
+.resize-origin-option[data-neighbor="right"]:before {
+  border-left-color: gold;
+  margin-top: -4px;
+}

src/css/settings-save.css

@@ -0,0 +1,26 @@
+.save-field {
+  width: 100%;
+}
+
+.save-status {
+  margin-top: 10px;
+  margin-bottom: -10px;
+  vertical-align: middle;
+  font-weight: normal;
+  text-shadow: none;
+  font-style: italic;
+}
+
+.save-file-name {
+  white-space: nowrap;
+  font-weight: bold;
+  color: white;
+  font-style: normal;
+}
+
+.save-desktop-file-name {
+    word-wrap: break-word;
+    font-weight: bold;
+    color: white;
+    font-style: normal;
+}

src/css/settings.css

@@ -21,56 +21,7 @@
   margin-right: 0;
 }
 
-/********************************************************** *j* j** j*j j j j** *****************/
-/* Settings icons                                            I  I   I I I\I  \                  */
-/********************************************************** *** *** *** * * '** *****************/
-
-.tool-icon.gallery-icon {
-  background-image: url(../img/gallery.png);
-  background-position: 3px 3px;
-  background-size: 39px 39px;
-}
-
-.tool-icon.resize-icon {
-  background-image: url(../img/resize-icon.png);
-  background-position: 10px 10px;
-  background-size: 26px 26px;
-}
-
-.tool-icon.save-icon {
-  background-image: url(../img/save.png);
-  background-position: 6px 6px;
-  background-size: 36px 36px;
-}
-
-.tool-icon.gear-icon {
-  background-image: url(../img/gear.png);
-  background-position: 6px 7px;
-  background-size: 32px 32px;
-}
-
-.tool-icon.upload-cloud-icon {
-  background-image: url(../img/cloud_export.png);
-  background-position: 4px 0px;
-  background-size: 36px 36px;
-  position: relative;
-}
-
-.tool-icon.local-storage-icon {
-  background-image: url(../img/local-storage-icon.png);
-  background-position: 10px 12px;
-  background-size: 30px;
-  position: relative;
-}
-
-.tool-icon.import-icon {
-  background-image: url(../img/import-icon.png);
-  background-position: 10px 5px;
-  background-size: 26px;
-  position: relative;
-}
-
-.upload-cloud-icon .label {
+.tool-icon .label {
   position: absolute;
   left: 0;
   bottom: 4px;
@@ -126,11 +77,11 @@
   text-transform: uppercase;
   border-bottom: 1px #aaa solid;
   padding-bottom: 5px;
+  color: gold;
 }
 
 .settings-description {
   margin : 0 0 10px 0;
-  display : inline-block;
 }
 
 .settings-form-section {
@@ -141,213 +92,6 @@
   margin : 10px 0;
 }
 
-/************************************************************************************************/
-/* Application settings                                                                         */
-/************************************************************************************************/
-
-.background-picker-wrapper {
-  overflow: hidden;
-  padding: 5px;
-}
-
-.background-picker {
-  cursor: pointer;
-  float: left;
-  height: 35px;
-  width: 35px;
-  background-color: transparent;
-  margin-right: 15px;
-  padding: 1px;
-  position: relative;
-}
-
-.background-picker:after {
-  content: " ";
-  position: absolute;
-  top: -2px;
-  right: -2px;
-  bottom: -2px;
-  left: -2px;
-}
-
-.background-picker:hover:after {
-  border: #eee 1px solid;
-}
-
-.background-picker.selected:after {
-  border: gold 1px solid;
-}
-
-/************************************************************************************************/
-/* Gif/Png Export panel                                                                         */
-/************************************************************************************************/
-
-.gif-upload-button,
-.gif-render-button {
-  margin-top : 10px;
-  margin-right : 10px;
-}
-
-.gif-export-radio-group {
-  margin:10px 0;
-}
-
-.gif-export-progress-status {
-  margin-left: 5px;
-}
-
-.gif-export-progress-bar {
-  margin-top:5px;
-  height:3px;
-  width: 0;
-  background:gold;
-}
-
-.gif-export-preview,
-.png-export-preview {
-  margin-top:20px;
-  max-width:240px;
-  position:relative;
-}
-
-.png-export-preview {
-  margin:10px 0;
-  overflow: hidden;
-}
-
-.png-export-preview img {
-  float: left;
-}
-
-.png-upload-status {
-  margin : 10px 0;
-}
-
-.preview-upload-ongoing:before{
-  content: "Upload ongoing ...";
-  position: absolute;
-  display: block;
-  height: 100%;
-  width: 100%;
-  text-align: center;
-  padding-top: 45%;
-  box-sizing:border-box;
-  -moz-box-sizing:border-box;
-  background: rgba(0,0,0,0.5);
-  color: white;
-}
-
-/************************************************************************************************/
-/* Import panel                                                                                 */
-/************************************************************************************************/
-
-.import-section,
-.resize-section {
-  margin: 15px 0;
-}
-
-.import-section-title {
-  display : inline-block;
-}
-
-.import-section-title-small {
-  width: 35px;
-}
-
-.import-section-disabled {
-  color : #888;
-}
-
-.import-section-preview {
-  display : inline-block;
-  height : 60px;
-  width: 60px;
-  border : 1px dashed #999;
-  border-radius: 3px;
-}
-
-.import-size-field,
-.resize-size-field {
-  width: 50px;
-  margin-right: 8px;
-  text-align: right;
-}
-
-.import-size-field:nth-of-type(2),
-.resize-size-field:nth-of-type(2) {
-  margin-left: 5px;
-}
-
-.file-input-button {
-  margin-right: 8px;
-  border-radius: 2px;
-}
-
-.file-input-status {
-  display: inline-block;
-  width: 130px;
-  overflow: hidden;
-
-  height: 1.5rem;
-  word-break : break-all;
-  vertical-align: middle;
-  font-style: italic;
-  font-weight: normal;
-  text-shadow: none;
-}
-
-.save-field {
-  width: 100%;
-}
-
-#save-status {
-  margin-top: 10px;
-}
-.status {
-  height: 1.5rem;
-  vertical-align: middle;
-  font-weight: normal;
-  text-shadow: none;
-}
-
-[name=smooth-resize-checkbox] {
-  margin : 0 8px;
-}
-
 [name*=checkbox] {
   vertical-align: middle;
 }
-
-
-/************************************************************************************************/
-/* Browse local piskels panel                                                                   */
-/************************************************************************************************/
-
-.local-piskels-list {
-  width: 100%;
-}
-
-.local-piskel-item {
-  height: 3em;
-}
-
-.local-piskel-name {
-  width: 40%;
-}
-
-.local-piskel-save-date {
-  font-weight : normal;
-}
-
-.local-piskels-list a {
-  text-decoration: none;
-}
-.local-piskels-list a:hover {
-  text-decoration: underline;
-}
-.local-piskel-load-link {
-  color : gold;
-}
-.local-piskel-delete-link {
-  color : red;
-}

src/css/sprites.css

@@ -0,0 +1,113 @@
+/*
+Icon classes can be used entirely standalone. They are named after their original file names.
+
+```html
+<!-- `display: block` sprite -->
+<div class="icon-home"></div>
+
+<!-- `display: inline-block` sprite -->
+<img class="icon-home" />
+```
+*/
+.icon-cloud_export {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -276px;
+  width: 50px;
+  height: 47px;
+}
+.icon-dragndrop {
+  background-image: url(../img/spritesheet.png);
+  background-position: -564px -173px;
+  width: 48px;
+  height: 48px;
+}
+.icon-duplicate {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -369px;
+  width: 16px;
+  height: 16px;
+}
+.icon-export {
+  background-image: url(../img/spritesheet.png);
+  background-position: -564px -225px;
+  width: 43px;
+  height: 42px;
+}
+.icon-favicon {
+  background-image: url(../img/spritesheet.png);
+  background-position: -582px -151px;
+  width: 16px;
+  height: 16px;
+}
+.icon-gallery {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -225px;
+  width: 52px;
+  height: 51px;
+}
+.icon-garbage {
+  background-image: url(../img/spritesheet.png);
+  background-position: 0px 0px;
+  width: 512px;
+  height: 512px;
+}
+.icon-gear {
+  background-image: url(../img/spritesheet.png);
+  background-position: -563px -323px;
+  width: 38px;
+  height: 37px;
+}
+.icon-import-icon {
+  background-image: url(../img/spritesheet.png);
+  background-position: -576px -69px;
+  width: 28px;
+  height: 36px;
+}
+.icon-keyboard {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -133px;
+  width: 70px;
+  height: 40px;
+}
+.icon-local-storage-icon {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px 0px;
+  width: 100px;
+  height: 69px;
+}
+.icon-merge-icon {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -69px;
+  width: 64px;
+  height: 64px;
+}
+.icon-plus {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -323px;
+  width: 51px;
+  height: 46px;
+}
+.icon-popup-preview-arrow-gold {
+  background-image: url(../img/spritesheet.png);
+  background-position: -576px -105px;
+  width: 24px;
+  height: 18px;
+}
+.icon-popup-preview-arrow-white {
+  background-image: url(../img/spritesheet.png);
+  background-position: -582px -133px;
+  width: 24px;
+  height: 18px;
+}
+.icon-resize-icon {
+  background-image: url(../img/spritesheet.png);
+  background-position: -512px -173px;
+  width: 52px;
+  height: 52px;
+}
+.icon-save {
+  background-image: url(../img/spritesheet.png);
+  background-position: -562px -276px;
+  width: 43px;
+  height: 42px;
+}

src/css/style.css

@@ -1,9 +1,5 @@
 body {
-  background: radial-gradient(circle, #000, #373737);
-  /* 16/06/2013 : -webkit still needed for
-  safari, safari mobile and android browser and chrome for android
-  cf http://caniuse.com/css-gradients */
-  background: -webkit-radial-gradient(circle, #000, #373737);
+  background: #1D1D1D;
 }
 
 /* Browser fixes */
@@ -20,235 +16,10 @@ body {
   user-select: initial;
 }
 
-/**
- * Application layout
- */
-
-.main-wrapper {
-  position: absolute;
-  top: 5px;
-  right: 0;
-  bottom: 5px;
-  left: 0;
-}
-
-.column-wrapper {
-  text-align: center;
-  font-size: 0;
-  position: absolute;
-  left: 100px; /* Reserve room for tools on the left edge of the screen. */
-  top: 0;
-  right: 50px; /* Reserve room for actions on the right edge of the screen. */
-  bottom: 0;
-}
-
-.column {
-  display: inline-block;
-}
-
-.left-column {
-  vertical-align: top;
-  height: 100%;
-  margin-right: 7px;
-}
-
-.main-column {
-  height: 100%;
-  position: relative;
-}
-
-.right-column {
-  vertical-align: top;
-  margin-left: 10px;
-  height: 100%;
-  position: relative;
-}
-
-.drawing-canvas-container {
-  font-size: 0;
-}
-
-.sticky-section {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  z-index: 1000;
-}
-
-.sticky-section .sticky-section-wrap {
-  display: table;
-  height: 100%;
-}
-
-.sticky-section .vertical-centerer {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-.left-sticky-section.sticky-section {
-  left: 0;
-  max-width: 100px;
-}
-
-.left-sticky-section .tool-icon {
-  float: left;
-}
-
-/**
- * Canvases layout
- */
-
-.canvas {
-  position: relative;
-  z-index: 1;
-}
-
-.canvas-container {
-  position: relative;
-  display: block;
-}
-
-.canvas-container .canvas-background {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
-.light-picker-background,
-.light-canvas-background .canvas-background {
-  background: url(../img/canvas_background/light_canvas_background.png) repeat;
-}
-
-.medium-picker-background,
-.medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/medium_canvas_background.png) repeat;
-}
-
-.lowcont-medium-picker-background,
-.lowcont-medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_medium_canvas_background.png) repeat;
-}
-
-.lowcont-dark-picker-background,
-.lowcont-dark-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_dark_canvas_background.png) repeat;
-}
-
-.layers-canvas,
-.canvas.onion-skin-canvas {
-  opacity: 0.2;
-}
-
-.canvas.canvas-overlay,
-.canvas.layers-canvas,
-.canvas.onion-skin-canvas {
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-/**
- * Z-indexes should match the drawing area canvas superposition order :
- * - 1 : draw layers below current layer
- * - 2 : draw current layer
- * - 3 : draw layers above current layer
- * - 4 : draw the tools overlay
- */
-.canvas.layers-below-canvas  {z-index:  7;}
-.canvas.drawing-canvas       {z-index:  8;}
-.canvas.layers-above-canvas  {z-index:  9;}
-.canvas.onion-skin-canvas    {z-index: 10;}
-.canvas.canvas-overlay       {z-index: 11;}
-
-/**
- * Animated preview styles.
- */
-
-.preview-container {
-  border : 0px Solid black;
-  border-radius:5px 0px 0px 5px;
-  box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
-  font-size: 0;
-}
-
-.preview-container .canvas-container {
+.no-overflow {
   overflow : hidden;
 }
 
-.preview-container canvas {
-  border : 0px Solid transparent;
-}
-
-#animated-preview-container {
-  background: #333;
-  border-radius : 0 0 2px 2px;
-  overflow : hidden;
-}
-
-#animated-preview-canvas-container {
-  height :200px;
-  width : 200px;
-}
-
-.tiled-frame-container {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background-repeat : repeat;
-}
-
-.display-fps {
-  float: left;
-  color: #aaa;
-  font-size: 12px;
-  min-width: 55px;
-  vertical-align: bottom;
-  line-height: 24px;
-}
-
-.range-fps {
-  overflow: hidden;
-  width: 120px;
-  height : 24px;
-  margin : 0;
-}
-
-/**
- * User messages
- */
-.user-message {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background-color: #F9EDBE;
-  padding: 10px 47px;
-  border-top-left-radius: 7px;
-  color: #222;
-  border: #F0C36D 1px solid;
-  border-right: 0;
-  border-bottom: 0;
-  font-weight: bold;
-  font-size: 13px;
-  z-index: 30000;
-  max-width: 300px;
-}
-
-.user-message .close {
-  position: absolute;
-  top: 6px;
-  right: 17px;
-  color: gray;
-  font-weight: bold;
-  cursor: pointer;
-  font-size: 18px;
-}
-
-.user-message .close:hover {
-  color: black;
-}
-
 .image-link {
   color : gold;
 }
@@ -276,9 +47,41 @@ body {
   left:0;
 }
 
-.cursor-coordinates {
-  color:#888;
-  font-size:12px;
-  font-weight:bold;
-  font-family:Courier;
+.uppercase {
+  text-transform: uppercase;
+}
+
+.checkbox-fix {
+  margin-left: 0;
+}
+
+/**
+ * TOOLTIPS
+ */
+.tooltip-shortcut {
+  color:gold;
+}
+
+.tooltip-container {
+  text-align: left;
+}
+
+.tooltip-descriptor {
+  color:#999;
+}
+
+.tooltip-descriptor:last-child {
+  padding-bottom: 5px;
+}
+
+.tooltip-descriptor-button {
+  padding: 2px;
+  border: 1px Solid #999;
+  font-size: 0.8em;
+  margin-right: 5px;
+  width: 35px;
+  text-align: center;
+  border-radius: 3px;
+  display: inline-block;
+  line-height: 10px;
 }

src/css/toolbox-animated-preview.css

@@ -0,0 +1,140 @@
+/**
+ * Animated preview styles.
+ */
+
+.preview-container {
+  flex-shrink: 0;
+
+  border : 0 Solid black;
+  border-radius:5px 0 0 5px;
+  box-shadow : 0 0 2px rgba(0,0,0,0.2);
+  font-size: 0;
+}
+
+.preview-container .canvas-container {
+  overflow : hidden;
+}
+
+.preview-container canvas {
+  border : 0 Solid transparent;
+}
+
+.canvas-container .animated-preview-canvas-background {
+  position : relative;
+  height: 100%;
+}
+
+#animated-preview-container {
+  background: #333;
+  border-radius : 0 0 2px 2px;
+  overflow : hidden;
+}
+
+.canvas-container-wrapper {
+  height :200px;
+  width : 200px;
+  overflow:hidden;
+}
+
+.preview-container .background-image-frame-container {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background-position: center;
+}
+
+.display-fps {
+  float: left;
+  color: #aaa;
+  font-size: 12px;
+  min-width: 55px;
+  vertical-align: bottom;
+  line-height: 26px;
+}
+
+.range-fps {
+  overflow: hidden;
+  width: 100px;
+  height : 26px;
+  margin : 0;
+  box-sizing: border-box;
+}
+
+.preview-toggle-onion-skin {
+  font-size: 2rem;
+  color: #aaa;
+  float: left;
+  line-height: 26px;
+  height: 100%;
+  padding-left: 5px;
+  padding-right: 5px;
+  border-right: 1px solid #222;
+  transition: 0.2s linear;
+  cursor:pointer;
+}
+
+.preview-toggle-onion-skin:hover {
+  color : white;
+}
+
+.preview-toggle-onion-skin-enabled,
+.preview-toggle-onion-skin-enabled:hover {
+  color : gold;
+}
+
+.preview-contextual-actions {
+  position : absolute;
+  z-index: 500;
+  right : 10px;
+  top : 10px;
+
+  cursor : pointer;
+
+  opacity: 0;
+  transition: 0.3s opacity, 0.3s border-color;
+}
+
+.minimap-container:hover .preview-contextual-actions {
+  opacity: 1;
+}
+
+.original-size-button {
+  width : 18px;
+  height: 18px;
+  line-height: 18px;
+  margin: 0 5px;
+
+  border: 2px solid white;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: white;
+
+  font-size: 10px;
+  font-weight: bold;
+  font-family: Tahoma;
+}
+
+.original-size-button-enabled {
+  color: gold;
+  border-color: gold;
+}
+
+.preview-contextual-action {
+  float: left;
+}
+
+.open-popup-preview-button {
+  border : 2px solid white;
+  background-color : rgba(0,0,0,0.3);
+}
+
+.open-popup-preview-button:hover {
+  border-color: gold;
+}
+
+/**
+ * The regular image is provided bby the sprite icons.png+icons.css
+ */
+.icon-minimap-popup-preview-arrow-white:hover {
+  background-image: url(../img/icons/minimap/minimap-popup-preview-arrow-gold.png);
+  background-position: 0 0;
+}

src/css/toolbox-layers-list.css

@@ -3,54 +3,80 @@
  * Layers container
  */
 .layers-list-container {
+  min-height: 85px;
+  display: flex;
+  flex-direction: column;
 }
 
+/**
+ * Layers title and toggle preview
+ */
+
 .layers-title {
-  background-image: url('../img/layers.svg');
-  background-size: 22px;
-  background-repeat: no-repeat;
-  background-position: 97%;
+  position: relative;
+  flex-shrink: 0;
 }
 
+.layers-toggle-preview {
+  position: absolute;
+  top: 0.3em;
+  right: 0.5em;
+
+  color: #999;
+  font-size: 1.3em;
+  cursor: pointer;
+
+  transition: 0.2s linear;
+}
+
+.layers-toggle-preview:hover {
+  color: white;
+}
+
+.layers-toggle-preview-enabled,
+.layers-toggle-preview-enabled:hover {
+  color : gold;
+}
+
+/**
+ * Layers buttons
+ */
+
+.layers-button {
+  margin: 0;
+  width: 16.66667%;
+  float : left;
+}
+
+/**
+ * Layers list
+ */
+
 .layers-list {
   font-size : 12px;
+  overflow: auto;
 }
 
 .layer-item {
+  position: relative;
   height:24px;
   line-height: 24px;
-  padding : 0 0 0 10px;
+  padding: 0 0 0 10px;
   border-top: 1px solid #444;
-  cursor : pointer;
-}
-
-.layer-item .edit-icon {
-  float: right;
-  width: 30px;
-  background-size: 12px;
-  opacity: 0;
-  transition : opacity 0.2s;
-}
-
-.layer-item:hover .edit-icon {
-  opacity : 0.6;
-}
-
-.layer-item:hover .edit-icon:hover {
-  opacity : 1;
+  cursor: pointer;
 }
 
 .layer-item:hover {
   background : #222;
 }
 
+.layer-item-opacity {
+  position: absolute;
+  right: 8px;
+}
+
 .current-layer-item,
 .current-layer-item:hover {
   background : #333;
   color: gold;
-}
-
-.layers-button-arrow {
-  font-family : 'Lucida Grande', Calibri;
-  padding : 2px 6px 0 6px;
 }

src/css/toolbox-palettes-list.css

@@ -1,63 +1,174 @@
-.palettes-list-select {
-  float:right;
-  max-width:90px;
-  margin-top: 3px;
+.palettes-list-container {
+  min-height: 100px;
+  display: flex;
+  flex-direction: column;
 }
 
 .palettes-title {
+  flex-shrink: 0;
   background-size: 22px;
   background-repeat: no-repeat;
   background-position: 97%;
 }
 
+/**
+ * Palettes action buttons
+ */
+
+.palettes-list-container .toolbox-buttons {
+  background-color: #3f3f3f;
+  height: 24px;
+  padding: 0;
+}
+
+.palettes-list-button,
+.palettes-list-select {
+  margin: 0;
+  float: left;
+}
+
+.palettes-list-button {
+  width: 16.66667%;
+}
+
+.palettes-list-select {
+  width: 66.66667%;
+  height: 100%;
+  padding: 0 5px 0 5px;
+
+  color: #aaa;
+  font-size : 0.75em;
+
+  text-align:left;
+  font-weight: normal;
+
+  transition : background-color 0.3s, color 0.3s;
+  cursor:pointer;
+}
+
+.palettes-list-select:hover,
+.palettes-list-select:focus {
+  background-color: #484848;
+  color: white;
+}
+
+.palettes-list-select:focus {
+  outline: none;
+}
+
+/*
+ * Palette colors list
+ */
+
 .palettes-list-colors {
-  overflow: auto;
+  height: 100%;
   max-height: 160px;
+  overflow: auto;
+  padding-top: 5px;
 }
 
 .palettes-list-color {
-  cursor : pointer;
+  cursor: pointer;
   float: left;
-  margin : 0 0 5px 5px;
-  width : 32px;
-  height : 32px;
+  margin: 0 0 5px 5px;
+  width: calc((100% - 30px) / 5);
+  height: 32px;
   position: relative;
 }
 
-.palettes-list-color:nth-child(-n+5) {
-  margin-top: 5px;
+.palettes-list-color div {
+  height: 100%;
 }
 
-.palettes-list-color div{
-  width : 32px;
-  height : 32px;
+/*
+ * Placeholder when no color is available in the current palette
+ */
+
+.palettes-list-no-colors {
+  height: 35px;
+  line-height: 35px;
+  width: 100%;
+  color: gray;
+  font-size: 0.7em;
+  font-style: italic;
+  text-align: center
 }
 
-.palettes-list-has-scrollbar .palettes-list-color,
-.palettes-list-has-scrollbar .palettes-list-color div{
-  width: 29px
-}
+/*
+ * Primary and secondary color markers
+ */
 
-.palettes-list-primary-color:before,
-.palettes-list-secondary-color:before {
+.palettes-list-primary-color:before, .palettes-list-secondary-color:before {
   content: "";
   position: absolute;
   bottom: 1px;
   display: inline-block;
-  border: 7px solid gold;
-  border-top-color: transparent;
-
-  width: 0px;
-  height: 0px;
+  background: url('data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20height%3D%2215%22%20width%3D%2215%22%3E%3Cpath%20stroke%3D%22gold%22%20stroke-width%3D%222%22%20d%3D%22M1%203v10h10z%22/%3E%3C/svg%3E');
+  width: 14px;
+  height: 14px;
 }
 
 .palettes-list-primary-color:before {
   left: 1px;
-  border-right-color: transparent;
 }
 
-
 .palettes-list-secondary-color:before {
   right: 1px;
-  border-left-color: transparent;
-}
+  background: url('data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20height%3D%2215%22%20width%3D%2215%22%3E%3Cpath%20stroke%3D%22gold%22%20stroke-width%3D%222%22%20d%3D%22M3%2013h10V3z%22/%3E%3C/svg%3E');
+}
+
+/*
+ * Color index for the 9 first colors
+ */
+
+.palettes-list-color:nth-child(-n+10):after {
+  position: absolute;
+  top: 0;
+  right: 0;
+
+  background-color: black;
+  color: gold;
+
+  font-family: Tahoma;
+  font-size: 0.5em;
+  font-weight: bold;
+
+  padding: 2px 3px 2px 3px;
+  border-radius: 0 0 0 2px;
+}
+
+.palettes-list-color:nth-child(1):after {
+  content: "1";
+}
+
+.palettes-list-color:nth-child(2):after {
+  content: "2";
+}
+
+.palettes-list-color:nth-child(3):after {
+  content: "3";
+}
+
+.palettes-list-color:nth-child(4):after {
+  content: "4";
+}
+
+.palettes-list-color:nth-child(5):after {
+  content: "5";
+}
+
+.palettes-list-color:nth-child(6):after {
+  content: "6";
+}
+
+.palettes-list-color:nth-child(7):after {
+  content: "7";
+}
+
+.palettes-list-color:nth-child(8):after {
+  content: "8";
+}
+
+.palettes-list-color:nth-child(9):after {
+  content: "9";
+}

src/css/toolbox.css

@@ -1,11 +1,10 @@
 .toolbox-container {
-  border: 4px solid #888;
+  border: 2px solid #888;
   font-size: medium;
   color: white;
   text-align: left;
-  border-radius: 4px;
+  border-radius: 2px;
   margin-top: 5px;
-  margin-bottom: 10px;
   overflow: hidden;
 }
 
@@ -13,24 +12,23 @@
   padding: 8px;
   margin: 0;
   font-size: 15px;
+  /* reset for firefox */
+  height: 16px;
   background: #222;
 }
 
-.toolbox-button-container {
-  overflow : hidden;
+.toolbox-buttons {
+  flex-shrink: 0;
+  overflow: hidden;
+  border-top: 1px solid #666;
+  border-bottom: 1px solid #222;
 }
 
-.toolbox-button {
-  margin: 0;
-  width: 25%;
-  float : left;
+.toolbox-buttons .button {
+  /* Override border propery on .button elements from form.css */
+  border-width: 0 1px 0 0;
 }
 
-/* @override */
-.button.toolbox-button {
-  border-left-width: 0;
-}
-
-.toolbox-button:last-child {
+.toolbox-buttons button:last-child {
   border-right-width: 0;
-}
+}

src/css/tools.css

@@ -1,10 +1,3 @@
-
-.tools-wrapper,
-.options-wrapper,
-.palette-wrapper {
-  float: left;
-}
-
 .tool-icon {
   position : relative;
   cursor : pointer;
@@ -12,9 +5,6 @@
   height: 46px;
   margin: 1px;
   background-color: #3a3a3a;
-  background-repeat: no-repeat;
-  background-position: 12px 12px;
-  background-size: 24px 24px;
 }
 
 .tool-icon.selected {
@@ -29,136 +19,77 @@
   width : 100%;
   border: 3px solid gold;
   box-sizing: border-box;
-  -moz-box-sizing: border-box;
 }
 
 .tool-icon:hover {
   background-color: #444;
 }
 
-/*
- * Tool icons:
- */
-.tool-icon.tool-pen {
-  background-image: url(../img/tools/pen.png);
-}
-
-.tool-icon.tool-vertical-mirror-pen {
-  background-image: url(../img/tools/mirror.png);
-  background-position: 0px 10px;
-  background-size: 38px 27px;
-}
-
-.tool-icon.tool-paint-bucket {
-  background-image: url(../img/tools/paintbucket.png);
-}
-
-.tool-icon.tool-eraser {
-  background-image: url(../img/tools/eraser.png);
-}
-
-.tool-icon.tool-stroke {
-  background-image: url(../img/tools/stroke.png);
-}
-
-.tool-icon.tool-rectangle {
-  background-image: url(../img/tools/rectangle.png);
-  background-position: 12px 14px;
-  background-size: 24px 20px;
-}
-
-.tool-icon.tool-circle {
-  background-image: url(../img/tools/circle.png);
-}
-
-.tool-icon.tool-move {
-  background-image: url(../img/tools/hand.png);
-  background-size: 24px 24px;
-}
-
-.tool-icon.tool-rectangle-select {
-  background-image: url(../img/tools/rectangle_selection.png);
-  background-position: 12px 14px;
-  background-size: 24px 20px;
-}
-
-.tool-icon.tool-shape-select {
-  background-image: url(../img/tools/magicwand.png);
-}
-
-.tool-icon.tool-lighten {
-  background-image: url(../img/tools/lighten.png);
-  background-size: 30px 30px;
-  background-position: 8px 8px;
-}
-
-.tool-icon.tool-colorpicker {
-  background-image: url(../img/tools/eyedropper.png);
-  background-size: 23px 23px;
-}
-
 /*
  * Tool cursors:
  */
 
-.tool-paint-bucket .drawing-canvas-container:hover {
-  cursor: url(../img/icons/paint-bucket.png) 12 12, pointer;
+.tool-paint-bucket .drawing-canvas-container:hover,
+.tool-colorswap .drawing-canvas-container:hover {
+  cursor: url(../img/cursors/paint-bucket.png) 12 12, pointer;
 }
 
 .tool-vertical-mirror-pen .drawing-canvas-container:hover {
-  cursor: url(../img/icons/vertical-mirror-pen.png) 5 15, pointer;
+  cursor: url(../img/cursors/vertical-mirror-pen.png) 5 15, pointer;
 }
 
 .tool-pen .drawing-canvas-container:hover,
-.tool-lighten .drawing-canvas-container:hover {
-  cursor: url(../img/icons/pen.png) 0 15, pointer;
+.tool-lighten .drawing-canvas-container:hover,
+.tool-dithering .drawing-canvas-container:hover {
+  cursor: url(../img/cursors/pen.png) 0 15, pointer;
 }
 
 .tool-eraser .drawing-canvas-container:hover {
-  cursor: url(../img/icons/eraser.png) 0 15, pointer;
+  cursor: url(../img/cursors/eraser.png) 0 15, pointer;
 }
 
 .tool-stroke .drawing-canvas-container:hover {
-  cursor: url(../img/icons/pen.png) 0 15, pointer;
+  cursor: url(../img/cursors/pen.png) 0 15, pointer;
 }
 
 .tool-rectangle .drawing-canvas-container:hover {
-  cursor: url(../img/icons/rectangle.png) 0 15, pointer;
+  cursor: url(../img/cursors/rectangle.png) 0 15, pointer;
 }
 
 .tool-circle .drawing-canvas-container:hover {
-  cursor: url(../img/icons/circle.png) 2 15, pointer;
+  cursor: url(../img/cursors/circle.png) 2 15, pointer;
 }
 
 .tool-move .drawing-canvas-container:hover {
-  cursor: url(../img/icons/hand.png) 15 15, pointer;
+  cursor: url(../img/cursors/hand.png) 7 7, pointer;
 }
 
-.tool-rectangle-select .drawing-canvas-container:hover {
+.tool-rectangle-select .drawing-canvas-container:hover,
+.tool-lasso-select .drawing-canvas-container:hover {
   cursor: crosshair;
 }
 
 .tool-shape-select .drawing-canvas-container:hover {
-  cursor: url(../img/icons/wand.png) 15 15, pointer;
+  cursor: url(../img/cursors/wand.png) 15 15, pointer;
 }
 
 .tool-colorpicker .drawing-canvas-container:hover {
-  cursor: url(../img/icons/dropper.png) 0 15, pointer;
+  cursor: url(../img/cursors/dropper.png) 0 15, pointer;
 }
 
-.swap-colors-icon {
-  background-image: url(../img/tools/swap-arrow-square-small-grey.png);
+.swap-colors-button {
   position: relative;
   top: 50px;
   left: 6px;
   height: 18px;
   width: 18px;
-  background-size: 18px;
+
   opacity : 0.3;
+
   cursor : pointer;
 }
 
-.swap-colors-icon:hover {
+.swap-colors-button:hover {
   opacity : 1;
 }
 
@@ -228,4 +159,3 @@
   );
 }
 
-

src/css/transformations.css

@@ -0,0 +1,7 @@
+.transformations-container {
+  flex-shrink: 0;
+}
+
+.transformations-container .tool-icon {
+  float:left;
+}