Merge + palette manager 1st drop

- can create palettes
- palettes are persisted to local storage
- can add colors to palettes using spectrum color picker
- can remove created palettes
- can revert changes on unsaved palettes

Merge branch 'master' into feature-color-palette

Conflicts:
	src/css/spectrum/spectrum-overrides.css
This commit is contained in:
jdescottes
2014-03-29 18:35:56 +01:00
16 changed files with 661 additions and 31 deletions

View File

@ -82,7 +82,7 @@ exports.scripts = [
"js/controller/settings/SettingsController.js",
// Dialogs sub-controllers
"js/controller/dialogs/ManagePalettesController.js",
"js/controller/dialogs/PaletteManagerController.js",
// Dialogs controller
"js/controller/dialogs/DialogsController.js",