near/berliner-winter
1
0
Fork 0
mirror of https://github.com/heyarne/berliner-winter.git synced 2026-05-06 19:23:39 +02:00
Code Issues Projects Releases Wiki Activity

Refactor the color module

Browse source
This commit is contained in:
Arne Schlüter 2015-02-08 09:58:07 +01:00
commit 2229d548b5
3 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/main.js
View file

@ -1,7 +1,7 @@
'use strict';
import $ from 'jquery';
import filter from './filter';
import {mixColors} from './colors';
import colorUtils from './colors';
// http://www.colourlovers.com/palette/1811244/1001_Stories
var colors = [ '#F8B195', '#F67280', '#C06C84', '#6C5B7B', '#355C7D' ];
@ -73,7 +73,7 @@ function pickColor (incident) {
return categories.indexOf(index) !== -1;
});
return incident.categories.length ? mixColors(categoryColors) : colors[4];
return incident.categories.length ? colorUtils.mix(categoryColors) : colors[4];
}
/**