홍길동 / 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 @@ ...@@ -160,12 +160,12 @@
160 // --- Ordinal scales for 7 values. 160 // --- Ordinal scales for 7 values.
161 161
162 // Colors per Mojo-Design's color palette.. 162 // Colors per Mojo-Design's color palette..
163 - // blue lt blue red lt red dk grey lt grey steel 163 + // blue red dk grey steel lt blue lt red lt grey
164 - var lightNorm = ['#5b99d2', '#66cef6', '#d05a55', '#db7773', '#716b6b', '#aeada8', '#7e9aa8'], 164 + var lightNorm = ['#5b99d2', '#d05a55', '#716b6b', '#7e9aa8', '#66cef6', '#db7773', '#aeada8' ],
165 - lightMute = ['#a8cceb', '#a8e9fd', '#f1a7a7', '#f8c9c9', '#b9b5b5', '#d7d6d4', '#bdcdd5'], 165 + lightMute = ['#a8cceb', '#f1a7a7', '#b9b5b5', '#bdcdd5', '#a8e9fd', '#f8c9c9', '#d7d6d4' ],
166 // TODO: dark theme 166 // TODO: dark theme
167 - darkNorm = ['#5b99d2', '#66cef6', '#d05a55', '#db7773', '#716b6b', '#aeada8', '#7e9aa8'], 167 + darkNorm = ['#5b99d2', '#d05a55', '#716b6b', '#7e9aa8', '#66cef6', '#db7773', '#aeada8' ],
168 - darkMute = ['#a8cceb', '#a8e9fd', '#f1a7a7', '#f8c9c9', '#b9b5b5', '#d7d6d4', '#bdcdd5']; 168 + darkMute = ['#a8cceb', '#f1a7a7', '#b9b5b5', '#bdcdd5', '#a8e9fd', '#f8c9c9', '#d7d6d4' ];
169 169
170 var colors= { 170 var colors= {
171 light: { 171 light: {
......
...@@ -157,8 +157,8 @@ describe('factory: fw/svg/svgUtil.js', function() { ...@@ -157,8 +157,8 @@ describe('factory: fw/svg/svgUtil.js', function() {
157 expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2'); 157 expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
158 }); 158 });
159 159
160 - it('should provide light blue', function () { 160 + it('should provide red', function () {
161 - expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6'); 161 + expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#d05a55');
162 }); 162 });
163 163
164 it('should provide paler shade of blue for muted', function () { 164 it('should provide paler shade of blue for muted', function () {
...@@ -177,16 +177,18 @@ describe('factory: fw/svg/svgUtil.js', function() { ...@@ -177,16 +177,18 @@ describe('factory: fw/svg/svgUtil.js', function() {
177 177
178 it('should iterate across the colors', function () { 178 it('should iterate across the colors', function () {
179 expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2'); 179 expect(sus.cat7().getColor('foo', false, 'light')).toEqual('#5b99d2');
180 - expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#66cef6'); 180 + expect(sus.cat7().getColor('bar', false, 'light')).toEqual('#d05a55');
181 - expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#d05a55'); 181 + expect(sus.cat7().getColor('baz', false, 'light')).toEqual('#716b6b');
182 + expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#7e9aa8');
183 + expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#66cef6');
182 expect(sus.cat7().getColor('goo', false, 'light')).toEqual('#db7773'); 184 expect(sus.cat7().getColor('goo', false, 'light')).toEqual('#db7773');
183 - expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b');
184 expect(sus.cat7().getColor('pip', false, 'light')).toEqual('#aeada8'); 185 expect(sus.cat7().getColor('pip', false, 'light')).toEqual('#aeada8');
185 - expect(sus.cat7().getColor('sdh', false, 'light')).toEqual('#7e9aa8'); 186 +
186 // and cycle back to the first color for item #8 187 // and cycle back to the first color for item #8
187 expect(sus.cat7().getColor('bri', false, 'light')).toEqual('#5b99d2'); 188 expect(sus.cat7().getColor('bri', false, 'light')).toEqual('#5b99d2');
189 +
188 // and return the same color for the same ID 190 // and return the same color for the same ID
189 - expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#716b6b'); 191 + expect(sus.cat7().getColor('zoo', false, 'light')).toEqual('#7e9aa8');
190 }); 192 });
191 193
192 // === translate(), scale(), skewX(), rotate() 194 // === translate(), scale(), skewX(), rotate()
......