홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
df2a4e69 1 parent 0b59e19a

Adjusted order of instance colors to run red/blue/grey/steel/lt-red/lt-blue/lt-grey. 

Change-Id: I29e51704b032f6446f45d2e5f53cc043a8994968
Inline Side-by-side
Showing 2 changed files with 14 additions and 12 deletions
......@@ -160,12 +160,12 @@
// --- Ordinal scales for 7 values.
// Colors per Mojo-Design's color palette..
// blue lt blue red lt red dk grey lt grey steel
var lightNorm = ['#5b99d2', '#66cef6', '#d05a55', '#db7773', '#716b6b', '#aeada8', '#7e9aa8'],
lightMute = ['#a8cceb', '#a8e9fd', '#f1a7a7', '#f8c9c9', '#b9b5b5', '#d7d6d4', '#bdcdd5'],
// blue red dk grey steel lt blue lt red lt grey
var lightNorm = ['#5b99d2', '#d05a55', '#716b6b', '#7e9aa8', '#66cef6', '#db7773', '#aeada8' ],
lightMute = ['#a8cceb', '#f1a7a7', '#b9b5b5', '#bdcdd5', '#a8e9fd', '#f8c9c9', '#d7d6d4' ],
// TODO: dark theme
darkNorm = ['#5b99d2', '#66cef6', '#d05a55', '#db7773', '#716b6b', '#aeada8', '#7e9aa8'],
darkMute = ['#a8cceb', '#a8e9fd', '#f1a7a7', '#f8c9c9', '#b9b5b5', '#d7d6d4', '#bdcdd5'];
darkNorm = ['#5b99d2', '#d05a55', '#716b6b', '#7e9aa8', '#66cef6', '#db7773', '#aeada8' ],
darkMute = ['#a8cceb', '#f1a7a7', '#b9b5b5', '#bdcdd5', '#a8e9fd', '#f8c9c9', '#d7d6d4' ];
var colors= {
light: {
......
......@@ -157,8 +157,8 @@ describe('factory: fw/svg/svgUtil.js', function() {
expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
});
it('should provide light blue', function () {
expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6');
it('should provide red', function () {
expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#d05a55');
});
it('should provide paler shade of blue for muted', function () {
......@@ -177,16 +177,18 @@ describe('factory: fw/svg/svgUtil.js', function() {
it('should iterate across the colors', function () {
expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6');
expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#d05a55');
expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#d05a55');
expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#716b6b');
expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#7e9aa8');
expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#66cef6');
expect(sus.cat7().getColor('goo', false, 'light')).toEqual('#db7773');
expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b');
expect(sus.cat7().getColor('pip', false, 'light')).toEqual('#aeada8');
expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#7e9aa8');
// and cycle back to the first color for item #8
expect(sus.cat7().getColor('bri', false, 'light')).toEqual('#5b99d2');
// and return the same color for the same ID
expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b');
expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#7e9aa8');
});
// === translate(), scale(), skewX(), rotate()
......