This is an automated email from the ASF dual-hosted git repository. johnbodley pushed a commit to branch john-bodley--colors-airbnb in repository https://gitbox.apache.org/repos/asf/superset.git
commit d263006e153695ac26fa8321fc7cafcc16f21aee Author: John Bodley <[email protected]> AuthorDate: Fri Apr 7 12:27:39 2023 +1200 Update editmode.test.ts --- .../cypress/integration/dashboard/editmode.test.ts | 8 +++---- .../explore/visualizations/dist_bar.test.js | 2 +- .../explore/visualizations/line.test.ts | 2 +- .../explore/visualizations/treemap.test.js | 6 ++--- .../src/color/colorSchemes/categorical/airbnb.ts | 27 +++++++++++----------- .../legacy-plugin-chart-map-box/Stories.tsx | 2 +- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts index d4e51046bc..dde8e296af 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts @@ -515,7 +515,7 @@ describe('Dashboard edit', () => { // label Anthony cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') .eq(2) - .should('have.css', 'fill', 'rgb(0, 122, 135)'); + .should('have.css', 'fill', 'rgb(244, 176, 42)'); // open main tab and nested tab openTab(0, 0); @@ -526,7 +526,7 @@ describe('Dashboard edit', () => { '[data-test-chart-name="Top 10 California Names Timeseries"] .line .nv-legend-symbol', ) .first() - .should('have.css', 'fill', 'rgb(0, 122, 135)'); + .should('have.css', 'fill', 'rgb(244, 176, 42)'); }); it('should apply the color scheme across main tabs', () => { @@ -560,7 +560,7 @@ describe('Dashboard edit', () => { cy.get('.treemap #rect-sum__SP_POP_TOTL').should( 'have.css', 'fill', - 'rgb(255, 90, 95)', + 'rgb(41, 105, 107)', ); // go to second tab @@ -569,7 +569,7 @@ describe('Dashboard edit', () => { cy.get('[data-test-chart-name="Trends"] .line .nv-legend-symbol') .first() - .should('have.css', 'fill', 'rgb(255, 90, 95)'); + .should('have.css', 'fill', 'rgb(41, 105, 107)'); // go back to first tab openTab(0, 0); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/dist_bar.test.js b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/dist_bar.test.js index 770e1e1c04..591ba31776 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/dist_bar.test.js +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/dist_bar.test.js @@ -89,6 +89,6 @@ describe('Visualization > Distribution bar chart', () => { ).should('exist'); cy.get('.dist_bar .nv-legend .nv-legend-symbol') .first() - .should('have.css', 'fill', 'rgb(255, 90, 95)'); + .should('have.css', 'fill', 'rgb(41, 105, 107)'); }); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts index 5cc398c7f3..8499db5946 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts @@ -85,7 +85,7 @@ describe('Visualization > Line', () => { ).should('exist'); cy.get('.line .nv-legend .nv-legend-symbol') .first() - .should('have.css', 'fill', 'rgb(255, 90, 95)'); + .should('have.css', 'fill', 'rgb(41, 105, 107)'); }); it('should work with adhoc metric', () => { diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/treemap.test.js b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/treemap.test.js index 158aa7b39b..29e6c46701 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/treemap.test.js +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/treemap.test.js @@ -37,9 +37,9 @@ describe('Visualization > Treemap', () => { number_format: '.3s', }; - const level0 = '.chart-container rect[style="fill: rgb(255, 90, 95);"]'; - const level1 = '.chart-container rect[style="fill: rgb(123, 0, 81);"]'; - const level2 = '.chart-container rect[style="fill: rgb(0, 122, 135);"]'; + const level0 = '.chart-container rect[style="fill: rgb(41, 105, 107);"]'; + const level1 = '.chart-container rect[style="fill: rgb(91, 202, 206);"]'; + const level2 = '.chart-container rect[style="fill: rgb(244, 176, 42);"]'; function verify(formData) { cy.visitChartByParams(formData); diff --git a/superset-frontend/packages/superset-ui-core/src/color/colorSchemes/categorical/airbnb.ts b/superset-frontend/packages/superset-ui-core/src/color/colorSchemes/categorical/airbnb.ts index 4754f7e281..a126f502a9 100644 --- a/superset-frontend/packages/superset-ui-core/src/color/colorSchemes/categorical/airbnb.ts +++ b/superset-frontend/packages/superset-ui-core/src/color/colorSchemes/categorical/airbnb.ts @@ -24,20 +24,19 @@ const schemes = [ id: 'bnbColors', label: 'Airbnb Colors', colors: [ - '#ff385c', // rausch - '#92174d', // plus - '#460479', // luxe - '#222222', // hof - '#dddddd', // deco - '#c13515', // arches - '#d0650b', // ondo - '#ffaf0f', // beach - '#7dv734', // lima - '#22bc4e', // spruce - '#00ba92', // norrr - '#007e82', // babu - '#2875f0', // mykonou - '#9b3197', // omiya + '#29696B', + '#5BCACE', + '#F4B02A', + '#F1826A', + '#792EB2', + '#C96EC6', + '#921E50', + '#B27700', + '#9C3498', + '#9C3498', + '#E4679D', + '#C32F0E', + '#9D63CA', ], }, ].map(s => new CategoricalScheme(s)); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/Stories.tsx index 6cdca623a1..dd95ffada5 100644 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/Stories.tsx +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-plugin-chart-map-box/Stories.tsx @@ -42,7 +42,7 @@ export const Basic = () => { allColumnsY: 'LAT', clusteringRadius: '60', globalOpacity: 1, - mapboxColor: 'rgb(0, 122, 135)', + mapboxColor: 'rgb(244, 176, 42)', mapboxLabel: [], mapboxStyle: 'mapbox://styles/mapbox/light-v9', pandasAggfunc: 'sum',
