From 3e89ec4ff2756834327d73c1f9e4e0d4b9791ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 24 Oct 2017 10:47:24 +0200 Subject: [PATCH] ux: updated icons --- .../app/features/dashboard/dashboard_model.ts | 3 +- .../features/dashboard/dashnav/dashnav.html | 1 + .../dashboard/import/dash_import.html | 2 +- ...model_specs.ts => dashboard_model.jest.ts} | 160 ++++++------ .../img/icons_dark_theme/icon_add_folder.svg | 39 ++- .../icons_dark_theme/icon_new_dashboard.svg | 43 ++-- public/img/icons_dark_theme/icon_zoom_out.svg | 15 ++ .../img/icons_light_theme/icon_add_folder.svg | 41 ++- .../icons_light_theme/icon_new_dashboard.svg | 41 +-- .../img/icons_light_theme/icon_zoom_out.svg | 15 ++ yarn.lock | 240 +++++++++++++++++- 11 files changed, 429 insertions(+), 171 deletions(-) rename public/app/features/dashboard/specs/{dashboard_model_specs.ts => dashboard_model.jest.ts} (77%) create mode 100644 public/img/icons_dark_theme/icon_zoom_out.svg create mode 100644 public/img/icons_light_theme/icon_zoom_out.svg diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts index 743bf040424..e16641eee6a 100644 --- a/public/app/features/dashboard/dashboard_model.ts +++ b/public/app/features/dashboard/dashboard_model.ts @@ -3,7 +3,8 @@ import _ from 'lodash'; import {GRID_COLUMN_COUNT, GRID_CELL_HEIGHT, REPEAT_DIR_VERTICAL} from 'app/core/constants'; import {DEFAULT_ANNOTATION_COLOR} from 'app/core/utils/colors'; -import {Emitter, contextSrv} from 'app/core/core'; +import {Emitter} from 'app/core/utils/emitter'; +import {contextSrv} from 'app/core/services/context_srv'; import sortByKeys from 'app/core/utils/sort_by_keys'; import {DashboardRow} from './row/row_model'; diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index 39a09ab0d35..490cdb2e4b4 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -2,6 +2,7 @@
+ diff --git a/public/app/features/dashboard/import/dash_import.html b/public/app/features/dashboard/import/dash_import.html index 6e66d1c3961..c617c752366 100644 --- a/public/app/features/dashboard/import/dash_import.html +++ b/public/app/features/dashboard/import/dash_import.html @@ -1,7 +1,7 @@

- + Import Dashboard

diff --git a/public/app/features/dashboard/specs/dashboard_model_specs.ts b/public/app/features/dashboard/specs/dashboard_model.jest.ts similarity index 77% rename from public/app/features/dashboard/specs/dashboard_model_specs.ts rename to public/app/features/dashboard/specs/dashboard_model.jest.ts index 151725031d8..2f7eff41ddc 100644 --- a/public/app/features/dashboard/specs/dashboard_model_specs.ts +++ b/public/app/features/dashboard/specs/dashboard_model.jest.ts @@ -1,5 +1,3 @@ -import {describe, beforeEach, it, expect} from 'test/lib/common'; - import _ from 'lodash'; import {DashboardModel} from '../dashboard_model'; import {PanelModel} from '../panel_model'; @@ -14,16 +12,16 @@ describe('DashboardModel', function() { }); it('should have title', function() { - expect(model.title).to.be('No Title'); + expect(model.title).toBe('No Title'); }); it('should have meta', function() { - expect(model.meta.canSave).to.be(true); - expect(model.meta.canShare).to.be(true); + expect(model.meta.canSave).toBe(true); + expect(model.meta.canShare).toBe(true); }); it('should have default properties', function() { - expect(model.panels.length).to.be(0); + expect(model.panels.length).toBe(0); }); }); @@ -37,7 +35,7 @@ describe('DashboardModel', function() { }); it('should return max id + 1', function() { - expect(model.getNextPanelId()).to.be(6); + expect(model.getNextPanelId()).toBe(6); }); }); @@ -47,8 +45,8 @@ describe('DashboardModel', function() { var saveModel = model.getSaveModelClone(); var keys = _.keys(saveModel); - expect(keys[0]).to.be('annotations'); - expect(keys[1]).to.be('autoUpdate'); + expect(keys[0]).toBe('annotations'); + expect(keys[1]).toBe('autoUpdate'); }); }); @@ -62,7 +60,7 @@ describe('DashboardModel', function() { it('adding panel should new up panel model', function() { dashboard.addPanel({type: 'test', title: 'test'}); - expect(dashboard.panels[0] instanceof PanelModel).to.be(true); + expect(dashboard.panels[0] instanceof PanelModel).toBe(true); }); it('duplicate panel should try to add to the right if there is space', function() { @@ -80,8 +78,8 @@ describe('DashboardModel', function() { dashboard.addPanel(panel); dashboard.duplicatePanel(dashboard.panels[0]); - expect(dashboard.panels[1].repeat).to.be(undefined); - expect(dashboard.panels[1].scopedVars).to.be(undefined); + expect(dashboard.panels[1].repeat).toBe(undefined); + expect(dashboard.panels[1].scopedVars).toBe(undefined); }); }); @@ -134,77 +132,77 @@ describe('DashboardModel', function() { }); it('should have title', function() { - expect(model.title).to.be('No Title'); + expect(model.title).toBe('No Title'); }); it('should have panel id', function() { - expect(graph.id).to.be(1); + expect(graph.id).toBe(1); }); it('should move time and filtering list', function() { - expect(model.time.from).to.be('now-1d'); - expect(model.templating.list[0].allFormat).to.be('glob'); + expect(model.time.from).toBe('now-1d'); + expect(model.templating.list[0].allFormat).toBe('glob'); }); it('graphite panel should change name too graph', function() { - expect(graph.type).to.be('graph'); + expect(graph.type).toBe('graph'); }); it('single stat panel should have two thresholds', function() { - expect(singlestat.thresholds).to.be('20,30'); + expect(singlestat.thresholds).toBe('20,30'); }); it('queries without refId should get it', function() { - expect(graph.targets[1].refId).to.be('B'); + expect(graph.targets[1].refId).toBe('B'); }); it('update legend setting', function() { - expect(graph.legend.show).to.be(true); + expect(graph.legend.show).toBe(true); }); it('move aliasYAxis to series override', function() { - expect(graph.seriesOverrides[0].alias).to.be("test"); - expect(graph.seriesOverrides[0].yaxis).to.be(2); + expect(graph.seriesOverrides[0].alias).toBe("test"); + expect(graph.seriesOverrides[0].yaxis).toBe(2); }); it('should move pulldowns to new schema', function() { - expect(model.annotations.list[1].name).to.be('old'); + expect(model.annotations.list[1].name).toBe('old'); }); it('table panel should only have two thresholds values', function() { - expect(table.styles[0].thresholds[0]).to.be("20"); - expect(table.styles[0].thresholds[1]).to.be("30"); - expect(table.styles[1].thresholds[0]).to.be("200"); - expect(table.styles[1].thresholds[1]).to.be("300"); + expect(table.styles[0].thresholds[0]).toBe("20"); + expect(table.styles[0].thresholds[1]).toBe("30"); + expect(table.styles[1].thresholds[0]).toBe("200"); + expect(table.styles[1].thresholds[1]).toBe("300"); }); it('graph grid to yaxes options', function() { - expect(graph.yaxes[0].min).to.be(1); - expect(graph.yaxes[0].max).to.be(10); - expect(graph.yaxes[0].format).to.be('kbyte'); - expect(graph.yaxes[0].label).to.be('left label'); - expect(graph.yaxes[0].logBase).to.be(1); - expect(graph.yaxes[1].min).to.be(5); - expect(graph.yaxes[1].max).to.be(15); - expect(graph.yaxes[1].format).to.be('ms'); - expect(graph.yaxes[1].logBase).to.be(2); + expect(graph.yaxes[0].min).toBe(1); + expect(graph.yaxes[0].max).toBe(10); + expect(graph.yaxes[0].format).toBe('kbyte'); + expect(graph.yaxes[0].label).toBe('left label'); + expect(graph.yaxes[0].logBase).toBe(1); + expect(graph.yaxes[1].min).toBe(5); + expect(graph.yaxes[1].max).toBe(15); + expect(graph.yaxes[1].format).toBe('ms'); + expect(graph.yaxes[1].logBase).toBe(2); - expect(graph.grid.rightMax).to.be(undefined); - expect(graph.grid.rightLogBase).to.be(undefined); - expect(graph.y_formats).to.be(undefined); + expect(graph.grid.rightMax).toBe(undefined); + expect(graph.grid.rightLogBase).toBe(undefined); + expect(graph.y_formats).toBe(undefined); }); it('dashboard schema version should be set to latest', function() { - expect(model.schemaVersion).to.be(16); + expect(model.schemaVersion).toBe(16); }); it('graph thresholds should be migrated', function() { - expect(graph.thresholds.length).to.be(2); - expect(graph.thresholds[0].op).to.be('gt'); - expect(graph.thresholds[0].value).to.be(200); - expect(graph.thresholds[0].fillColor).to.be('yellow'); - expect(graph.thresholds[1].value).to.be(400); - expect(graph.thresholds[1].fillColor).to.be('red'); + expect(graph.thresholds.length).toBe(2); + expect(graph.thresholds[0].op).toBe('gt'); + expect(graph.thresholds[0].value).toBe(200); + expect(graph.thresholds[0].fillColor).toBe('yellow'); + expect(graph.thresholds[1].value).toBe(400); + expect(graph.thresholds[1].fillColor).toBe('red'); }); }); @@ -216,13 +214,13 @@ describe('DashboardModel', function() { }); it('Should set meta canEdit and canSave to false', function() { - expect(model.meta.canSave).to.be(false); - expect(model.meta.canEdit).to.be(false); + expect(model.meta.canSave).toBe(false); + expect(model.meta.canEdit).toBe(false); }); it('getSaveModelClone should remove meta', function() { var clone = model.getSaveModelClone(); - expect(clone.meta).to.be(undefined); + expect(clone.meta).toBe(undefined); }); }); @@ -279,13 +277,13 @@ describe('DashboardModel', function() { }); it('should update query schema', function() { - expect(target.fields).to.be(undefined); - expect(target.select.length).to.be(2); - expect(target.select[0].length).to.be(4); - expect(target.select[0][0].type).to.be('field'); - expect(target.select[0][1].type).to.be('mean'); - expect(target.select[0][2].type).to.be('math'); - expect(target.select[0][3].type).to.be('alias'); + expect(target.fields).toBe(undefined); + expect(target.select.length).toBe(2); + expect(target.select[0].length).toBe(4); + expect(target.select[0][0].type).toBe('field'); + expect(target.select[0][1].type).toBe('mean'); + expect(target.select[0][2].type).toBe('math'); + expect(target.select[0][3].type).toBe('alias'); }); }); @@ -305,13 +303,13 @@ describe('DashboardModel', function() { }); it('should add empty list', function() { - expect(model.annotations.list.length).to.be(1); - expect(model.templating.list.length).to.be(0); + expect(model.annotations.list.length).toBe(1); + expect(model.templating.list.length).toBe(0); }); it('should add builtin annotation query', function() { - expect(model.annotations.list[0].builtIn).to.be(1); - expect(model.templating.list.length).to.be(0); + expect(model.annotations.list[0].builtIn).toBe(1); + expect(model.templating.list.length).toBe(0); }); }); @@ -323,15 +321,15 @@ describe('DashboardModel', function() { }); it('Should format timestamp with second resolution by default', function() { - expect(dashboard.formatDate(1234567890000)).to.be('2009-02-13 23:31:30'); + expect(dashboard.formatDate(1234567890000)).toBe('2009-02-13 23:31:30'); }); it('Should format timestamp with second resolution even if second format is passed as parameter', function() { - expect(dashboard.formatDate(1234567890007,'YYYY-MM-DD HH:mm:ss')).to.be('2009-02-13 23:31:30'); + expect(dashboard.formatDate(1234567890007,'YYYY-MM-DD HH:mm:ss')).toBe('2009-02-13 23:31:30'); }); it('Should format timestamp with millisecond resolution if format is passed as parameter', function() { - expect(dashboard.formatDate(1234567890007,'YYYY-MM-DD HH:mm:ss.SSS')).to.be('2009-02-13 23:31:30.007'); + expect(dashboard.formatDate(1234567890007,'YYYY-MM-DD HH:mm:ss.SSS')).toBe('2009-02-13 23:31:30.007'); }); }); @@ -344,7 +342,7 @@ describe('DashboardModel', function() { }); it('should not enable submmenu', function() { - expect(model.meta.submenuEnabled).to.be(false); + expect(model.meta.submenuEnabled).toBe(false); }); }); @@ -361,7 +359,7 @@ describe('DashboardModel', function() { }); it('should enable submmenu', function() { - expect(model.meta.submenuEnabled).to.be(true); + expect(model.meta.submenuEnabled).toBe(true); }); }); @@ -378,7 +376,7 @@ describe('DashboardModel', function() { }); it('should enable submmenu', function() { - expect(model.meta.submenuEnabled).to.be(true); + expect(model.meta.submenuEnabled).toBe(true); }); }); @@ -395,7 +393,7 @@ describe('DashboardModel', function() { }); it('should not enable submmenu', function() { - expect(model.meta.submenuEnabled).to.be(false); + expect(model.meta.submenuEnabled).toBe(false); }); }); @@ -412,7 +410,7 @@ describe('DashboardModel', function() { }); it('should not enable submmenu', function() { - expect(dashboard.meta.submenuEnabled).to.be(false); + expect(dashboard.meta.submenuEnabled).toBe(false); }); }); @@ -442,18 +440,18 @@ describe('DashboardModel', function() { }); it('should repeat panel 3 times', function() { - expect(dashboard.panels.length).to.be(3); + expect(dashboard.panels.length).toBe(3); }); it('should mark panel repeated', function() { - expect(dashboard.panels[0].repeat).to.be('apps'); - expect(dashboard.panels[1].repeatPanelId).to.be(2); + expect(dashboard.panels[0].repeat).toBe('apps'); + expect(dashboard.panels[1].repeatPanelId).toBe(2); }); it('should set scopedVars on panels', function() { - expect(dashboard.panels[0].scopedVars.apps.value).to.be('se1'); - expect(dashboard.panels[1].scopedVars.apps.value).to.be('se2'); - expect(dashboard.panels[2].scopedVars.apps.value).to.be('se3'); + expect(dashboard.panels[0].scopedVars.apps.value).toBe('se1'); + expect(dashboard.panels[1].scopedVars.apps.value).toBe('se2'); + expect(dashboard.panels[2].scopedVars.apps.value).toBe('se3'); }); it('should place on first row and adjust width so all fit', function() { @@ -472,11 +470,11 @@ describe('DashboardModel', function() { }); it('reused panel should copy properties from source', function() { - expect(dashboard.panels[1].fill).to.be(10); + expect(dashboard.panels[1].fill).toBe(10); }); it('should have same panel count', function() { - expect(dashboard.panels.length).to.be(3); + expect(dashboard.panels.length).toBe(3); }); }); @@ -492,11 +490,11 @@ describe('DashboardModel', function() { }); it('should remove scopedVars value for last variable', function() { - expect(dashboard.panels[0].scopedVars.apps).to.be(undefined); + expect(dashboard.panels[0].scopedVars.apps).toBe(undefined); }); it('should have new variable value in scopedVars', function() { - expect(dashboard.panels[0].scopedVars.server.value).to.be("se1"); + expect(dashboard.panels[0].scopedVars.server.value).toBe("se1"); }); }); @@ -507,7 +505,7 @@ describe('DashboardModel', function() { }); it('should clean up repeated panel', function() { - expect(dashboard.panels.length).to.be(2); + expect(dashboard.panels.length).toBe(2); }); }); @@ -518,11 +516,11 @@ describe('DashboardModel', function() { }); it('should clean up repeated panel', function() { - expect(dashboard.panels.length).to.be(1); + expect(dashboard.panels.length).toBe(1); }); it('should remove scoped vars from reused panel', function() { - expect(dashboard.panels[0].scopedVars).to.be(undefined); + expect(dashboard.panels[0].scopedVars).toBe(undefined); }); }); diff --git a/public/img/icons_dark_theme/icon_add_folder.svg b/public/img/icons_dark_theme/icon_add_folder.svg index d7ac00099e3..3eddd5ddc5d 100644 --- a/public/img/icons_dark_theme/icon_add_folder.svg +++ b/public/img/icons_dark_theme/icon_add_folder.svg @@ -3,29 +3,26 @@ - - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/public/img/icons_dark_theme/icon_new_dashboard.svg b/public/img/icons_dark_theme/icon_new_dashboard.svg index 326cbf1ca7f..a7927425ba5 100644 --- a/public/img/icons_dark_theme/icon_new_dashboard.svg +++ b/public/img/icons_dark_theme/icon_new_dashboard.svg @@ -3,30 +3,31 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/public/img/icons_dark_theme/icon_zoom_out.svg b/public/img/icons_dark_theme/icon_zoom_out.svg new file mode 100644 index 00000000000..f94f0fa665e --- /dev/null +++ b/public/img/icons_dark_theme/icon_zoom_out.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_add_folder.svg b/public/img/icons_light_theme/icon_add_folder.svg index ad4638e7e32..81bbf349616 100644 --- a/public/img/icons_light_theme/icon_add_folder.svg +++ b/public/img/icons_light_theme/icon_add_folder.svg @@ -4,26 +4,25 @@ width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/img/icons_light_theme/icon_new_dashboard.svg b/public/img/icons_light_theme/icon_new_dashboard.svg index a4ea6c4f4b0..68c24e648d4 100644 --- a/public/img/icons_light_theme/icon_new_dashboard.svg +++ b/public/img/icons_light_theme/icon_new_dashboard.svg @@ -7,26 +7,27 @@ .st1{fill:url(#SVGID_1_);} - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/public/img/icons_light_theme/icon_zoom_out.svg b/public/img/icons_light_theme/icon_zoom_out.svg new file mode 100644 index 00000000000..b85181c1a31 --- /dev/null +++ b/public/img/icons_light_theme/icon_zoom_out.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/yarn.lock b/yarn.lock index b195e8f34b6..662152a2271 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1782,7 +1782,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.11.0, commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0: +commander@2, commander@2.11.0, commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -2185,6 +2185,228 @@ cyclist@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" +d3-array@1, d3-array@1.2.1, d3-array@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc" + +d3-axis@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa" + +d3-brush@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz#00c2f238019f24f6c0a194a26d41a1530ffe7bc4" + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3-chord@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz#7dec4f0ba886f713fe111c45f763414f6f74ca2c" + dependencies: + d3-array "1" + d3-path "1" + +d3-collection@1, d3-collection@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2" + +d3-color@1, d3-color@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b" + +d3-dispatch@1, d3-dispatch@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8" + +d3-drag@1, d3-drag@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz#df8dd4c502fb490fc7462046a8ad98a5c479282d" + dependencies: + d3-dispatch "1" + d3-selection "1" + +d3-dsv@1, d3-dsv@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.7.tgz#137076663f398428fc3d031ae65370522492b78f" + dependencies: + commander "2" + iconv-lite "0.4" + rw "1" + +d3-ease@1, d3-ease@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e" + +d3-force@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz#cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3" + dependencies: + d3-collection "1" + d3-dispatch "1" + d3-quadtree "1" + d3-timer "1" + +d3-format@1, d3-format@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.0.tgz#6b480baa886885d4651dc248a8f4ac9da16db07a" + +d3-geo@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.8.1.tgz#50615c33454487e350db71059f84f71cda2dd983" + dependencies: + d3-array "1" + +d3-hierarchy@1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz#a1c845c42f84a206bcf1c01c01098ea4ddaa7a26" + +d3-interpolate@1, d3-interpolate@1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.5.tgz#69e099ff39214716e563c9aec3ea9d1ea4b8a79f" + dependencies: + d3-color "1" + +d3-path@1, d3-path@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764" + +d3-polygon@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz#16888e9026460933f2b179652ad378224d382c62" + +d3-quadtree@1, d3-quadtree@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz#ac7987e3e23fe805a990f28e1b50d38fcb822438" + +d3-queue@3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618" + +d3-random@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz#6642e506c6fa3a648595d2b2469788a8d12529d3" + +d3-request@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz#a1044a9ef4ec28c824171c9379fae6d79474b19f" + dependencies: + d3-collection "1" + d3-dispatch "1" + d3-dsv "1" + xmlhttprequest "1" + +d3-scale-chromatic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.1.1.tgz#811406e8e09dab78a49dac4a32047d5d3edd0c44" + dependencies: + d3-interpolate "1" + +d3-scale@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.6.tgz#bce19da80d3a0cf422c9543ae3322086220b34ed" + dependencies: + d3-array "^1.2.0" + d3-collection "1" + d3-color "1" + d3-format "1" + d3-interpolate "1" + d3-time "1" + d3-time-format "2" + +d3-selection@1, d3-selection@1.1.0, d3-selection@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.1.0.tgz#1998684896488f839ca0372123da34f1d318809c" + +d3-shape@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777" + dependencies: + d3-path "1" + +d3-time-format@2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.0.tgz#a1d9540a1dc498817d44066b121b19a4a83e3531" + dependencies: + d3-time "1" + +d3-time-format@2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.5.tgz#9d7780204f7c9119c9170b1a56db4de9a8af972e" + dependencies: + d3-time "1" + +d3-time@1, d3-time@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.7.tgz#94caf6edbb7879bb809d0d1f7572bc48482f7270" + +d3-timer@1, d3-timer@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531" + +d3-transition@1, d3-transition@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.0.tgz#cfc85c74e5239324290546623572990560c3966f" + dependencies: + d3-color "1" + d3-dispatch "1" + d3-ease "1" + d3-interpolate "1" + d3-selection "^1.1.0" + d3-timer "1" + +d3-voronoi@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c" + +d3-zoom@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.6.0.tgz#eb645b07fd0c37acc8b36b88476b781ed277b40e" + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3@^4.11.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/d3/-/d3-4.11.0.tgz#15ce99ec33e6941718cfd8fb826071b4fb7c48cb" + dependencies: + d3-array "1.2.1" + d3-axis "1.0.8" + d3-brush "1.0.4" + d3-chord "1.0.4" + d3-collection "1.0.4" + d3-color "1.0.3" + d3-dispatch "1.0.3" + d3-drag "1.2.1" + d3-dsv "1.0.7" + d3-ease "1.0.3" + d3-force "1.1.0" + d3-format "1.2.0" + d3-geo "1.8.1" + d3-hierarchy "1.1.5" + d3-interpolate "1.1.5" + d3-path "1.0.5" + d3-polygon "1.0.3" + d3-quadtree "1.0.3" + d3-queue "3.0.7" + d3-random "1.1.0" + d3-request "1.0.6" + d3-scale "1.0.6" + d3-selection "1.1.0" + d3-shape "1.2.0" + d3-time "1.0.7" + d3-time-format "2.0.5" + d3-timer "1.0.7" + d3-transition "1.1.0" + d3-voronoi "1.1.2" + d3-zoom "1.6.0" + d@1: version "1.0.0" resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" @@ -4102,14 +4324,14 @@ i@0.3.x: version "0.3.5" resolved "https://registry.yarnpkg.com/i/-/i-0.3.5.tgz#1d2b854158ec8169113c6cb7f6b6801e99e211d5" +iconv-lite@0.4, iconv-lite@0.4.19, iconv-lite@~0.4.13: + version "0.4.19" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" + iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" -iconv-lite@0.4.19, iconv-lite@~0.4.13: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" - icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -7821,6 +8043,10 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" +rw@1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" + rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" @@ -9436,6 +9662,10 @@ xmlhttprequest-ssl@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" +xmlhttprequest@1: + version "1.8.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" + xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"