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
 
@@ -20,5 +26,12 @@ diff.txt
 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.10
+  - "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,55 +1,50 @@
-/**
- * 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.
- */
-
-
 module.exports = function(grunt) {
-  var dateFormat = require('dateformat');
-  var now = new Date();
-  var version = '-' + dateFormat(now, "yyyy-mm-dd-hh-MM");
 
-  var mapToSrcFolder = function (path) {
-    return "src/" + path;
+  // 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 piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder).filter(function (path) {
+  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;
   });
-  var piskelStyles = require('./src/piskel-style-list.js').styles.map(mapToSrcFolder);
 
-  var mapToCasperFolder = function (path) {
-    return "test/casperjs/" + path;
-  };
+  // get the list of styles paths to include
+  var stylePaths = require('./src/piskel-style-list.js').styles;
+  var piskelStyles = prefixPaths(stylePaths, "src/");
 
-  var casperEnvironments = {
-    'local' : {
-      suite : './test/casperjs/LocalTestSuite.js',
-      delay : 50
-    },
-    'travis' : {
-      suite : './test/casperjs/TravisTestSuite.js',
-      delay : 10000
-    }
-  };
+  var getCasperConfig = function (suiteName, delay, host) {
+    var testPaths = require('./test/casperjs/' + suiteName).tests;
+    var tests = prefixPaths(testPaths, "test/casperjs/");
 
-  var getCasperConfig = function (env) {
-    var conf = casperEnvironments[env];
-    var tests = require(conf.suite).tests.map(mapToCasperFolder);
     return {
       filesSrc : tests,
       options : {
         args : {
-          baseUrl : 'http://localhost:' + '<%= express.test.options.port %>/',
-          mode : '?debug',
-          delay : conf.delay
+          baseUrl : 'http://' + host + ':' + PORT.TEST,
+          mode : DEV_MODE,
+          delay : delay
         },
         async : false,
         direct : false,
@@ -60,126 +55,167 @@ module.exports = function(grunt) {
     };
   };
 
-  var getExpressConfig = function (source, port, host) {
-    var bases;
-    if (typeof source === 'string') {
-      bases = [source];
-    } else if (Array.isArray(source)) {
-      bases = source;
+  var getConnectConfig = function (base, port, host) {
+    if (typeof base === 'string') {
+      base = [base];
     }
 
     return {
       options: {
         port: port,
-        hostname : host || 'localhost',
-        bases: bases
+        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 !)
       ]
     },
-    express: {
-      test: getExpressConfig(['src', 'test'], 9991),
-      regular: getExpressConfig('dest', 9001),
-      debug: getExpressConfig(['src', 'test'], 9901)
+
+    /**
+     * 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 : {
-      'travis' : getCasperConfig('travis'),
-      'local' : getCasperConfig('local')
+
+    /**
+     * 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' + version + '.js'
+        dest : 'dest/prod/js/piskel-packaged' + version + '.js'
       },
       css : {
         src : piskelStyles,
-        dest : 'dest/css/piskel-style-packaged' + version + '.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' + version + '.js']
+          'dest/tmp/js/piskel-packaged-min.js' : ['dest/prod/js/piskel-packaged' + version + '.js']
         }
       }
     },
+
+    includereplace: {
+      all: {
+        src: 'src/index.html',
+        dest: 'dest/tmp/index.html',
+        options : {
+          globals : {
+            'version' : version
+          }
+        }
+      }
+    },
+
     replace: {
-      main: {
+      // main-partial.html is used when embedded in piskelapp.com
+      mainPartial: {
         options: {
-          patterns: [
-            {
-              match: 'version',
-              replacement: version
-            }
-          ]
-        },
-        files: [
-          {src: ['src/piskel-boot.js'], dest: 'dest/piskel-boot.js'}
-        ]
-      },
-      editor: {
-        options: {
-          patterns: [
-            {
-              match: /templates\//g,
-              replacement: "../templates"+version+"/"
-            },{
-              match: /piskel-boot.js/g,
-              replacement: "../piskel-boot"+version+".js"
-            },{
+          patterns: [{
               match: /^(.|[\r\n])*<!--body-main-start-->/,
-              replacement: "",
+              replacement: "{% raw %}",
               description : "Remove everything before body-main-start comment"
             },{
               match: /<!--body-main-end-->(.|[\r\n])*$/,
-              replacement: "",
+              replacement: "{% endraw %}",
               description : "Remove everything after body-main-end comment"
             },{
               match: /([\r\n])  /g,
@@ -189,153 +225,124 @@ module.exports = function(grunt) {
           ]
         },
         files: [
-          {src: ['src/index.html'], dest: 'dest/piskelapp-partials/main-partial.html'}
+          // 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'}
         ]
-      }
       },
-    copy: {
-      main: {
-        files: [
-          {src: ['dest/js/piskel-packaged-min.js'], dest: 'dest/js/piskel-packaged-min' + version + '.js'},
-          {src: ['dest/piskel-boot.js'], dest: 'dest/piskel-boot' + version + '.js'},
-          {src: ['src/logo.png'], dest: 'dest/logo.png'},
-          {src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.js'},
-          {src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/js/lib/gif/gif.ie.worker.js'},
-          {expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
-          {expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
-          {expand: true, src: ['**/*.html'], cwd: 'src/', dest: 'dest/', filter: 'isFile'}
-        ]
-      }
-    },
-    closureCompiler:  {
+      // remove the fake header from the desktop build
+      desktop: {
         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
+          patterns: [{
+              match: /<!--standalone-start-->(?:.|[\r\n])*<!--standalone-end-->/,
+              replacement: "",
+              description : "Remove everything between standalone-start & standalone-end"
             }
-
+          ]
         },
-      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'
+        files: [
+          {src: ['dest/prod/index.html'], dest: 'dest/prod/index.html'}
+        ]
       }
     },
+
+    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'}
+        ]
+      },
+      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'},
+        ]
+      }
+    },
+
+    /**
+     * TESTING
+     */
+
     karma: {
       unit: {
         configFile: 'karma.conf.js'
       }
     },
-    nodewebkit: {
+
+    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.
-        mac: true,
           win: true,
           linux32: true,
           linux64: true
         },
-      src: ['./dest/**/*', "./package.json", "!./dest/desktop/"]
+        src: ['./dest/prod/**/*', "./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-copy');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-express');
-  grunt.loadNpmTasks('grunt-replace');
-  grunt.loadNpmTasks('grunt-ghost');
-  grunt.loadNpmTasks('grunt-open');
-  grunt.loadNpmTasks('grunt-karma');
-  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-travis', ['lint', 'compile', 'unit-test', 'express:test', 'ghost:travis']);
+  grunt.registerTask('test-travis', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:travis']);
   // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('test-local', ['lint', 'compile', 'unit-test', 'express: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']);
 
   grunt.registerTask('test', ['test-travis']);
   grunt.registerTask('precommit', ['test-local']);
 
-
-  // Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
-  grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
-
-  grunt.registerTask('rep', ['replace:main', 'replace:editor']);
-
-  grunt.registerTask('merge',  ['concat:js', 'concat:css', 'uglify', 'rep', '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

@@ -38,7 +38,7 @@ Piskel supports the following browsers :
 
 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 (Windows and MacOS)
+## Offline version
 
 Offline builds are available. More details in the [dedicated wiki page](https://github.com/juliandescottes/piskel/wiki/Desktop-applications).
 
@@ -49,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
@@ -66,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

@@ -6,7 +6,9 @@ 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)

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/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/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

@@ -6,7 +6,7 @@ SETLOCAL
   SET PISKELAPP_PATH="C:\Development\git\piskel-website"
 
   ECHO "Copying files to piskelapp"
-  XCOPY "%PISKEL_PATH%\dest" "%PISKELAPP_PATH%\static\editor" /e /i /h /y
+  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"

misc/scripts/package-windows-executable.cmd

@@ -6,14 +6,11 @@ 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%\piskel\win\piskel
-
+  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.exe", "%DEST_FOLDER%\piskel-logo.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033

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');

package.json

@@ -1,40 +1,57 @@
 {
-  "author": "Julian Descottes, Vincent Renaudin",
   "name": "piskel",
-  "main": "./dest/index.html",
-  "description": "Web based 2d animations editor",
-  "version": "0.4.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": {
-    "dateformat": "1.0.8-1.2.3",
-    "grunt": "~0.4.5",
-    "grunt-closure-tools": "~0.9.7",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-concat": "0.5.0",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-contrib-uglify": "0.5.0",
-    "grunt-contrib-watch": "0.6.1",
-    "grunt-express": "1.4.1",
+    "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-leading-indent": "0.1.0",
-    "grunt-node-webkit-builder": "0.1.21",
+    "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-replace": "0.7.8",
-    "grunt-karma": "~0.8.2",
-    "karma": "0.12.17",
-    "karma-chrome-launcher": "^0.1.4",
-    "karma-phantomjs-launcher": "^0.1.4",
-    "karma-jasmine": "^0.2.0",
-    "nodewebkit": "~0.10.1"
+    "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/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

@@ -66,7 +66,8 @@
   display: none;
 }
 
-.color-picker-slider {
+.color-picker-slider,
+.color-picker-input {
   padding: 0 10px;
   height : 25px;
   overflow: hidden;
@@ -91,6 +92,14 @@
   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-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

@@ -60,7 +60,7 @@
 
 .color-preview {
   width: 170px;
-  height: 76px;
+  height: 70px;
   margin: 11px;
 }
 

src/css/dialogs-import-image.css

@@ -2,28 +2,68 @@
 /* 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;
-  height : 60px;
-  width: 60px;
   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: 55px;
+  width: 80px;
 }
 
-.import-size-field,
-.resize-size-field {
-  width: 50px;
-  margin-right: 8px;
-  text-align: right;
+.dialog-section-radio {
+  margin-top: 15px;
+  vertical-align: sub;
 }
 
-.import-size-field:nth-of-type(2),
-.resize-size-field:nth-of-type(2) {
+.import-size-field:nth-of-type(2) {
   margin-left: 5px;
 }
 
@@ -31,12 +71,17 @@
   display: inline-block;
   overflow: hidden;
 
-  height: 2rem;
-  word-break : break-all;
+  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] {
@@ -45,11 +90,12 @@
 
 .dialog-import-body {
   padding: 10px 20px;
-  font-size:1.5em
+  font-size:1.3em
 }
 
 .import-button {
   font-size: 1em;
-  height: auto;
-  padding: 5px 10px;
+  height: 28px;
+  padding: 0px 10px;
+  margin-top: 15px;
 }

src/css/dialogs.css

@@ -21,7 +21,7 @@
 }
 
 #dialog-container-wrapper.animated {
-  transition: opacity 0.5s;
+  transition: opacity 0.2s;
 }
 
 #dialog-container-wrapper.show {
@@ -44,10 +44,6 @@
   overflow: auto;
 }
 
-.animated #dialog-container {
-  transition:margin-top 0.5s;
-}
-
 .show #dialog-container {
   margin-top: 0;
 }
@@ -65,24 +61,19 @@
   margin-top: -250px;
 }
 
-#dialog-container.import-image {
-  width: 500px;
-  height: 300px;
-  top : 50%;
-  left : 50%;
-  position : absolute;
-  margin-left: -250px;
-}
-
-.show #dialog-container.import-image {
-  margin-top: -150px;
-}
-
 .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;
@@ -90,6 +81,7 @@
   padding: 10px;
   color: black;
   font-size: 1.8em;
+  height: 45px;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
 }

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 {
@@ -129,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;
 }
 
@@ -145,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;
 }
 
@@ -156,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;
 }
 
@@ -171,10 +160,10 @@
   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;
 }
 
@@ -185,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,24 +0,0 @@
-.action-icon {
-  cursor: pointer;
-  height: 100%;
-  background-repeat: no-repeat;
-  background-position: 50%;
-}
-
-.edit-icon {
-  background-image: url('../img/tools/pen.png');
-  background-repeat: no-repeat;
-}
-
-.merge-icon {
-  background-image: url('../img/merge-icon.png');
-  background-repeat: no-repeat;
-}
-
-.plus-icon {
-  font-size:15px;
-  text-align:center;
-}
-
-.delete-icon {
-}

src/css/layout.css

@@ -13,6 +13,8 @@
 .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;
@@ -20,10 +22,6 @@
   bottom: 0;
 }
 
-.column {
-  display: inline-block;
-}
-
 .left-column {
   vertical-align: top;
   height: 100%;
@@ -36,10 +34,17 @@
 }
 
 .right-column {
+  box-sizing: border-box;
   vertical-align: top;
-  margin-left: 10px;
   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 {
@@ -103,25 +108,24 @@
 
 .light-picker-background,
 .light-canvas-background .canvas-background {
-  background: url(../img/canvas_background/light_canvas_background.png) repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEXf39////8zI3BgAAAAHklEQVR4AWNghAIGCMDgjwgFCDDSw2M0PSCD0fQAACRcAgF4ciGUAAAAAElFTkSuQmCC') repeat;
 }
 
 .medium-picker-background,
 .medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/medium_canvas_background.png) repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEW6urr///82MBGFAAAAHUlEQVR4AWOAAUYoQOePEAUj3v9oYDQ9gMBoegAAJFwCAbLaTIMAAAAASUVORK5CYII=') repeat;
 }
 
 .lowcont-medium-picker-background,
 .lowcont-medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_medium_canvas_background.png) repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEXV1dXb29tFGkCIAAAAHklEQVR4AWNghAIGCMDgjwgFCDDSw2M0PSCD0fQAACRcAgF4ciGUAAAAAElFTkSuQmCC') repeat;
 }
 
 .lowcont-dark-picker-background,
 .lowcont-dark-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_dark_canvas_background.png) repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABlBMVEVMTExVVVUnhsEkAAAAHUlEQVR4AWOAAUYoQOePEAUj3v9oYDQ9gMBoegAAJFwCAbLaTIMAAAAASUVORK5CYII=') repeat;
 }
 
-.layers-canvas,
 .canvas.onion-skin-canvas {
   opacity: 0.2;
 }

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 {

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

@@ -23,6 +23,10 @@
   float: left;
 }
 
+.png-export-preview .light-picker-background {
+  max-width:240px;
+}
+
 .gif-upload-status {
   width: 180px;
   margin-left: 5px;
@@ -52,3 +56,128 @@
   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-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,55 +21,6 @@
   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.export-icon {
-  background-image: url(../img/export.png);
-  background-position: 7px 5px;
-  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;
-}
-
 .tool-icon .label {
   position: absolute;
   left: 0;
@@ -121,7 +72,6 @@
 }
 
 .settings-title {
-  color : gold;
   margin-top: 20px;
   margin-bottom: 10px;
   text-transform: uppercase;
@@ -132,7 +82,6 @@
 
 .settings-description {
   margin : 0 0 10px 0;
-  display : inline-block;
 }
 
 .settings-form-section {
@@ -146,66 +95,3 @@
 [name*=checkbox] {
   vertical-align: middle;
 }
-
-/************************************************************************************************/
-/* 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;
-}
-
-
-
-/************************************************************************************************/
-/* Save panel                                                                   */
-/************************************************************************************************/
-
-.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;
-}

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 */
@@ -50,3 +46,42 @@ body {
 .pull-left {
   left:0;
 }
+
+.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

@@ -3,9 +3,11 @@
  */
 
 .preview-container {
-  border : 0px Solid black;
-  border-radius:5px 0px 0px 5px;
-  box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
+  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;
 }
 
@@ -14,7 +16,12 @@
 }
 
 .preview-container canvas {
-  border : 0px Solid transparent;
+  border : 0 Solid transparent;
+}
+
+.canvas-container .animated-preview-canvas-background {
+  position : relative;
+  height: 100%;
 }
 
 #animated-preview-container {
@@ -23,16 +30,17 @@
   overflow : hidden;
 }
 
-#animated-preview-canvas-container {
+.canvas-container-wrapper {
   height :200px;
   width : 200px;
+  overflow:hidden;
 }
 
-.tiled-frame-container {
+.preview-container .background-image-frame-container {
   height: 100%;
   width: 100%;
   position: relative;
-  background-repeat : repeat;
+  background-position: center;
 }
 
 .display-fps {
@@ -50,7 +58,6 @@
   height : 26px;
   margin : 0;
   box-sizing: border-box;
-  padding:0;
 }
 
 .preview-toggle-onion-skin {
@@ -74,3 +81,60 @@
 .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,17 +3,18 @@
  * Layers container
  */
 .layers-list-container {
+  min-height: 85px;
+  display: flex;
+  flex-direction: column;
 }
 
-/*.layers-title {
-  background-image: url('../img/layers.svg');
-  background-size: 22px;
-  background-repeat: no-repeat;
-  background-position: 97%;
-}*/
+/**
+ * Layers title and toggle preview
+ */
 
 .layers-title {
   position: relative;
+  flex-shrink: 0;
 }
 
 .layers-toggle-preview {
@@ -37,11 +38,27 @@
   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;
@@ -53,27 +70,13 @@
   background : #222;
 }
 
+.layer-item-opacity {
+  position: absolute;
+  right: 8px;
+}
+
 .current-layer-item,
 .current-layer-item:hover {
   background : #333;
   color: gold;
 }
-
-.layers-button-container {
-  overflow : hidden;
-}
-
-.layers-button {
-  margin: 0;
-  width: 16.66667%;
-  float : left;
-}
-
-/* @override */
-.layers-button-container .layers-button {
-  border-left-width: 0;
-}
-
-.layers-button:last-child {
-  border-right-width: 0;
-}

src/css/toolbox-palettes-list.css

@@ -1,54 +1,24 @@
+.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-list-colors {
-    overflow: auto;
-    max-height: 160px;
-}
-.palettes-list-color {
-    cursor: pointer;
-    float: left;
-    margin: 0 0 5px 5px;
-    width: 32px;
-    height: 32px;
-    position: relative;
-}
-.palettes-list-color:nth-child(-n+5) {
-    margin-top: 5px;
-}
-.palettes-list-color div {
-    width: 32px;
-    height: 32px;
-}
-.palettes-list-has-scrollbar .palettes-list-color, .palettes-list-has-scrollbar .palettes-list-color div {
-    width: 29px
-}
-.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;
-}
-.palettes-list-primary-color:before {
-    left: 1px;
-    border-right-color: transparent;
-}
-.palettes-list-secondary-color:before {
-    right: 1px;
-    border-left-color: transparent;
-}
-.palettes-list-actions {
+
+/**
+ * Palettes action buttons
+ */
+
+.palettes-list-container .toolbox-buttons {
   background-color: #3f3f3f;
-    border-bottom-color: #222;
   height: 24px;
   padding: 0;
-    overflow: hidden;
 }
 
 .palettes-list-button,
@@ -60,47 +30,145 @@
 .palettes-list-button {
   width: 16.66667%;
 }
+
 .palettes-list-select {
   width: 66.66667%;
   height: 100%;
   padding: 0 5px 0 5px;
 
-    border-style: solid;
-    border-width: 1px 0 1px 0;
-
   color: #aaa;
   font-size : 0.75em;
 
-    /*thanks firefox, you suck*/
   text-align:left;
-    /*text-shadow:none;*/
   font-weight: normal;
 
   transition : background-color 0.3s, color 0.3s;
   cursor:pointer;
 }
 
-.palettes-list-select:hover {
-    color: white;
-    background-color: #484848;
-}
-
+.palettes-list-select:hover,
 .palettes-list-select:focus {
   background-color: #484848;
   color: white;
+}
+
+.palettes-list-select:focus {
   outline: none;
 }
 
-.palettes-list-actions .edit-icon {
-    background-size: 15px;
-    background-position: 50%;
+/*
+ * Palette colors list
+ */
+
+.palettes-list-colors {
+  height: 100%;
+  max-height: 160px;
+  overflow: auto;
+  padding-top: 5px;
 }
+
+.palettes-list-color {
+  cursor: pointer;
+  float: left;
+  margin: 0 0 5px 5px;
+  width: calc((100% - 30px) / 5);
+  height: 32px;
+  position: relative;
+}
+
+.palettes-list-color div {
+  height: 100%;
+}
+
+/*
+ * Placeholder when no color is available in the current palette
+ */
+
 .palettes-list-no-colors {
-    height: 42px;
+  height: 35px;
+  line-height: 35px;
   width: 100%;
-    color: grey;
+  color: gray;
   font-size: 0.7em;
   font-style: italic;
-    line-height: 42px;
   text-align: center
 }
+
+/*
+ * Primary and secondary color markers
+ */
+
+.palettes-list-primary-color:before, .palettes-list-secondary-color:before {
+  content: "";
+  position: absolute;
+  bottom: 1px;
+  display: inline-block;
+  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;
+}
+
+.palettes-list-secondary-color:before {
+  right: 1px;
+  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,5 +12,23 @@
   padding: 8px;
   margin: 0;
   font-size: 15px;
+  /* reset for firefox */
+  height: 16px;
   background: #222;
 }
+
+.toolbox-buttons {
+  flex-shrink: 0;
+  overflow: hidden;
+  border-top: 1px solid #666;
+  border-bottom: 1px solid #222;
+}
+
+.toolbox-buttons .button {
+  /* Override border propery on .button elements from form.css */
+  border-width: 0 1px 0 0;
+}
+
+.toolbox-buttons button:last-child {
+  border-right-width: 0;
+}

src/css/tools.css

@@ -5,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 {
@@ -22,161 +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-position: 8px 8px;
-  background-size: 30px 30px;
-}
-
-.tool-icon.tool-colorpicker {
-  background-image: url(../img/tools/eyedropper.png);
-  background-size: 23px 23px;
-}
-
-.tool-icon.tool-colorswap {
-  background-image: url(../img/tools/swap-colors.png);
-  background-position: 6px 6px;
-  background-size: 36px 36px;
-}
-
-.tool-icon.tool-flip {
-  background-image: url(../img/tools/flip.png);
-  background-position: 7px 11px;
-  background-size: 32px;
-}
-
-.tool-icon.tool-rotate {
-  background-image: url(../img/tools/rotate.png);
-  background-position: 10px 9px;
-  background-size: 26px;
-}
-
-.tool-icon.tool-clone {
-  background-image: url(../img/tools/clone.png);
-  background-position: 9px 15px;
-  background-size: 30px;
-}
-
 /*
  * Tool cursors:
  */
 
 .tool-paint-bucket .drawing-canvas-container:hover,
 .tool-colorswap .drawing-canvas-container:hover {
-  cursor: url(../img/icons/paint-bucket.png) 12 12, pointer;
+  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;
 }
 
@@ -246,28 +159,3 @@
   );
 }
 
-.tools-tooltip-container {
-  text-align: left;
-  padding-bottom: 5px;
-}
-
-.tools-tooltip-shortcut {
-  color:gold;
-}
-
-.tools-tooltip-descriptor {
-  color:#999;
-}
-
-.tools-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/transformations.css

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