From b62b31143d73782f2aced7825f7bd682a28c9703 Mon Sep 17 00:00:00 2001 From: Oskar Hane Date: Fri, 23 Nov 2018 11:51:53 +0100 Subject: [PATCH 1/2] Add more viz styling colors Be consistent with Neo4j Bloom --- .../modules/D3Visualization/graphStyle.js | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/src/browser/modules/D3Visualization/graphStyle.js b/src/browser/modules/D3Visualization/graphStyle.js index b3862aad34b..b747e196613 100644 --- a/src/browser/modules/D3Visualization/graphStyle.js +++ b/src/browser/modules/D3Visualization/graphStyle.js @@ -111,39 +111,64 @@ export default function neoGraphStyle () { ] const defaultColors = [ { - color: '#A5ABB6', + color: '#FFE081', 'border-color': '#9AA1AC', 'text-color-internal': '#FFFFFF' }, { - color: '#68BDF6', - 'border-color': '#5CA8DB', + color: '#C990C0', + 'border-color': '#b261a5', 'text-color-internal': '#FFFFFF' }, { - color: '#6DCE9E', - 'border-color': '#60B58B', + color: '#F79767', + 'border-color': '#f36924', 'text-color-internal': '#FFFFFF' }, { - color: '#FF756E', - 'border-color': '#E06760', + color: '#57C7E3', + 'border-color': '#23b3d7', 'text-color-internal': '#FFFFFF' }, { - color: '#DE9BF9', - 'border-color': '#BF85D6', + color: '#F16667', + 'border-color': '#eb2728', 'text-color-internal': '#FFFFFF' }, { - color: '#FB95AF', - 'border-color': '#E0849B', + color: '#D9C8AE', + 'border-color': '#c0a378', + 'text-color-internal': '#604A0E' + }, + { + color: '#8DCC93', + 'border-color': '#5db665', + 'text-color-internal': '#604A0E' + }, + { + color: '#ECB5C9', + 'border-color': '#da7298', + 'text-color-internal': '#604A0E' + }, + { + color: '#4C8EDA', + 'border-color': '#2870c2', 'text-color-internal': '#FFFFFF' }, { - color: '#FFD86E', - 'border-color': '#EDBA39', + color: '#FFC454', + 'border-color': '#d7a013', 'text-color-internal': '#604A0E' + }, + { + color: '#DA7194', + 'border-color': '#cc3c6c', + 'text-color-internal': '#FFFFFF' + }, + { + color: '#569480', + 'border-color': '#447666', + 'text-color-internal': '#FFFFFF' } ] const Selector = (function () { From e4124a7709eb66ce426e1f5a298d4c67e94d795a Mon Sep 17 00:00:00 2001 From: Oskar Hane Date: Fri, 23 Nov 2018 12:03:37 +0100 Subject: [PATCH 2/2] Fix failing tests --- src/browser/modules/D3Visualization/graphStyle.test.js | 8 ++++---- .../__snapshots__/VisualizationView.test.js.snap | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/browser/modules/D3Visualization/graphStyle.test.js b/src/browser/modules/D3Visualization/graphStyle.test.js index 53b49189df8..6fa2dda54e2 100644 --- a/src/browser/modules/D3Visualization/graphStyle.test.js +++ b/src/browser/modules/D3Visualization/graphStyle.test.js @@ -84,8 +84,8 @@ relationship { } node.foo { - color: #68BDF6; - border-color: #5CA8DB; + color: #C990C0; + border-color: #b261a5; text-color-internal: #FFFFFF; defaultCaption: ; } @@ -124,8 +124,8 @@ relationship { } node.foo\\.bar { - color: #68BDF6; - border-color: #5CA8DB; + color: #C990C0; + border-color: #b261a5; text-color-internal: #FFFFFF; defaultCaption: ; } diff --git a/src/browser/modules/Stream/CypherFrame/__snapshots__/VisualizationView.test.js.snap b/src/browser/modules/Stream/CypherFrame/__snapshots__/VisualizationView.test.js.snap index d5015bcc161..99b2d1a2aa3 100644 --- a/src/browser/modules/Stream/CypherFrame/__snapshots__/VisualizationView.test.js.snap +++ b/src/browser/modules/Stream/CypherFrame/__snapshots__/VisualizationView.test.js.snap @@ -29,7 +29,7 @@ exports[`Visualization renders with result 1`] = ` >
  • *
  • Person