From eeeb21077d74ee13964819c3e424ff998884e704 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Fri, 25 Sep 2020 14:49:30 -0700 Subject: [PATCH] feat: adding all icons from the design system to the codebase (#11033) * error -> error-solid * warning -> warning-solid * all the new icons mixed in! * card-view -> card_view * circle-check-solid -> circle_check_solid * corrected circle-check to new name and correct (stroke) icon * sort-asc/desc -> sort_asc/desc * databases -> database * compass -> nav_explore * pencil -> edit-alt * more pencil migrations * easy list view rename * star -> favorite (changed in Figma) * removing deprecated icon * renaming icon to mach figma * More -> More Horiz * forgot to change this when ranming the file * updating some icon names in use * adding hella icons * fixing errant viewboxes * removing dropdown-arrow in favor of triangle-down * adding key to storybook map. * fixing icon component reference * tweaks to fave star styling to support revised icon * fixing a bad icon inclusion * missed a license * touchup to virtual dataset... will tweak later. * e2e fix * linting --- .../integration/dashboard/edit_mode.test.js | 2 +- .../integration/dashboard/markdown.test.ts | 2 +- .../integration/dashboard/save.test.js | 4 +- superset-frontend/images/icons/alert.svg | 21 ++ .../images/icons/alert_solid.svg | 22 ++ superset-frontend/images/icons/binoculars.svg | 21 ++ superset-frontend/images/icons/bolt.svg | 21 ++ superset-frontend/images/icons/bolt_small.svg | 21 ++ .../images/icons/bolt_small_run.svg | 21 ++ superset-frontend/images/icons/calendar.svg | 21 ++ superset-frontend/images/icons/cancel.svg | 21 ++ .../images/icons/cancel_solid.svg | 22 ++ .../icons/{card-view.svg => card_view.svg} | 0 superset-frontend/images/icons/cards.svg | 21 ++ .../images/icons/cards_locked.svg | 22 ++ superset-frontend/images/icons/caret_down.svg | 21 ++ superset-frontend/images/icons/caret_left.svg | 21 ++ .../images/icons/caret_right.svg | 21 ++ superset-frontend/images/icons/caret_up.svg | 21 ++ .../images/icons/checkbox-half.svg | 2 +- .../images/icons/checkbox-off.svg | 2 +- .../images/icons/checkbox-on.svg | 2 +- superset-frontend/images/icons/circle.svg | 21 ++ .../images/icons/circle_check.svg | 21 ++ ...check-solid.svg => circle_check_solid.svg} | 0 superset-frontend/images/icons/clock.svg | 21 ++ superset-frontend/images/icons/code.svg | 21 ++ superset-frontend/images/icons/cog.svg | 22 ++ superset-frontend/images/icons/collapse.svg | 21 ++ .../images/icons/color_palette.svg | 21 ++ superset-frontend/images/icons/components.svg | 22 ++ superset-frontend/images/icons/copy.svg | 21 ++ .../images/icons/cursor_target.svg | 21 ++ .../icons/{databases.svg => database.svg} | 2 +- .../icons/dataset_virtual_greyscale.svg | 22 ++ superset-frontend/images/icons/download.svg | 21 ++ .../images/icons/dropdown-arrow.svg | 21 -- superset-frontend/images/icons/edit.svg | 21 ++ .../images/icons/{pencil.svg => edit_alt.svg} | 0 superset-frontend/images/icons/email.svg | 21 ++ superset-frontend/images/icons/error.svg | 33 +- .../images/icons/error_solid.svg | 22 ++ .../images/icons/error_solid_small.svg | 22 ++ superset-frontend/images/icons/expand.svg | 21 ++ superset-frontend/images/icons/eye.svg | 21 ++ superset-frontend/images/icons/eye_slash.svg | 21 ++ .../images/icons/favorite-selected.svg | 4 +- .../images/icons/favorite-unselected.svg | 4 +- .../images/icons/favorite_small_selected.svg | 21 ++ superset-frontend/images/icons/field_abc.svg | 21 ++ .../images/icons/field_boolean.svg | 21 ++ superset-frontend/images/icons/field_date.svg | 21 ++ .../images/icons/field_derived.svg | 21 ++ superset-frontend/images/icons/field_num.svg | 21 ++ .../images/icons/field_struct.svg | 21 ++ superset-frontend/images/icons/file.svg | 21 ++ superset-frontend/images/icons/filter.svg | 21 ++ superset-frontend/images/icons/folder.svg | 21 ++ superset-frontend/images/icons/full.svg | 21 ++ superset-frontend/images/icons/gear.svg | 21 ++ superset-frontend/images/icons/grid.svg | 21 ++ superset-frontend/images/icons/image.svg | 21 ++ superset-frontend/images/icons/info-solid.svg | 22 ++ superset-frontend/images/icons/info.svg | 21 ++ .../images/icons/info_solid_small.svg | 22 ++ superset-frontend/images/icons/join.svg | 21 ++ superset-frontend/images/icons/keyboard.svg | 21 ++ superset-frontend/images/icons/layers.svg | 21 ++ superset-frontend/images/icons/lightbulb.svg | 21 ++ superset-frontend/images/icons/list.svg | 21 ++ .../icons/{list-view.svg => list_view.svg} | 0 superset-frontend/images/icons/location.svg | 21 ++ .../images/icons/lock_locked.svg | 21 ++ .../images/icons/lock_unlocked.svg | 21 ++ superset-frontend/images/icons/map.svg | 21 ++ superset-frontend/images/icons/message.svg | 21 ++ superset-frontend/images/icons/minus.svg | 21 ++ .../images/icons/minus_solid.svg | 22 ++ .../images/icons/{more.svg => more_horiz.svg} | 0 superset-frontend/images/icons/move.svg | 21 ++ superset-frontend/images/icons/nav_charts.svg | 22 ++ .../images/icons/nav_dashboard.svg | 21 ++ superset-frontend/images/icons/nav_data.svg | 21 ++ .../icons/{compass.svg => nav_explore.svg} | 0 superset-frontend/images/icons/nav_home.svg | 21 ++ superset-frontend/images/icons/nav_lab.svg | 21 ++ superset-frontend/images/icons/note.svg | 21 ++ superset-frontend/images/icons/paperclip.svg | 21 ++ .../images/icons/placeholder.svg | 21 ++ superset-frontend/images/icons/plus.svg | 21 ++ superset-frontend/images/icons/plus_large.svg | 21 ++ superset-frontend/images/icons/plus_small.svg | 21 ++ superset-frontend/images/icons/plus_solid.svg | 22 ++ superset-frontend/images/icons/refresh.svg | 21 ++ superset-frontend/images/icons/server.svg | 21 ++ .../icons/{sort-asc.svg => sort_asc.svg} | 0 .../icons/{sort-desc.svg => sort_desc.svg} | 0 superset-frontend/images/icons/sql.svg | 22 ++ superset-frontend/images/icons/table.svg | 22 ++ superset-frontend/images/icons/tag.svg | 21 ++ .../images/icons/triangle_change.svg | 21 ++ .../images/icons/triangle_down.svg | 21 ++ .../images/icons/triangle_up.svg | 21 ++ superset-frontend/images/icons/up-level.svg | 21 ++ superset-frontend/images/icons/user.svg | 21 ++ superset-frontend/images/icons/warning.svg | 31 +- .../{circle-check.svg => warning_solid.svg} | 4 +- superset-frontend/images/icons/x-large.svg | 21 ++ superset-frontend/images/icons/x-small.svg | 21 ++ .../views/CRUD/chart/ChartList_spec.jsx | 2 +- .../CRUD/dashboard/DashboardList_spec.jsx | 4 +- .../components/ErrorMessage/ErrorAlert.tsx | 4 +- superset-frontend/src/components/FaveStar.tsx | 2 - .../src/components/Icon/icon.stories.jsx | 2 +- .../src/components/Icon/index.tsx | 320 ++++++++++++++++-- .../ListViewCard/ListViewCard.stories.tsx | 4 +- .../src/components/NavDropdown/index.tsx | 8 +- .../src/dashboard/components/Header.jsx | 4 +- .../components/HeaderActionsDropdown.jsx | 2 +- superset-frontend/src/explore/main.less | 1 - .../src/messageToasts/components/Toast.tsx | 2 +- .../src/views/CRUD/chart/ChartList.tsx | 6 +- .../views/CRUD/dashboard/DashboardList.tsx | 6 +- .../views/CRUD/data/database/DatabaseList.tsx | 2 +- .../CRUD/data/database/DatabaseModal.tsx | 2 +- .../CRUD/data/dataset/AddDatasetModal.tsx | 2 +- .../views/CRUD/data/dataset/DatasetList.tsx | 4 +- superset-frontend/stylesheets/superset.less | 11 - 128 files changed, 2226 insertions(+), 138 deletions(-) create mode 100644 superset-frontend/images/icons/alert.svg create mode 100644 superset-frontend/images/icons/alert_solid.svg create mode 100644 superset-frontend/images/icons/binoculars.svg create mode 100644 superset-frontend/images/icons/bolt.svg create mode 100644 superset-frontend/images/icons/bolt_small.svg create mode 100644 superset-frontend/images/icons/bolt_small_run.svg create mode 100644 superset-frontend/images/icons/calendar.svg create mode 100644 superset-frontend/images/icons/cancel.svg create mode 100644 superset-frontend/images/icons/cancel_solid.svg rename superset-frontend/images/icons/{card-view.svg => card_view.svg} (100%) create mode 100644 superset-frontend/images/icons/cards.svg create mode 100644 superset-frontend/images/icons/cards_locked.svg create mode 100644 superset-frontend/images/icons/caret_down.svg create mode 100644 superset-frontend/images/icons/caret_left.svg create mode 100644 superset-frontend/images/icons/caret_right.svg create mode 100644 superset-frontend/images/icons/caret_up.svg create mode 100644 superset-frontend/images/icons/circle.svg create mode 100644 superset-frontend/images/icons/circle_check.svg rename superset-frontend/images/icons/{circle-check-solid.svg => circle_check_solid.svg} (100%) create mode 100644 superset-frontend/images/icons/clock.svg create mode 100644 superset-frontend/images/icons/code.svg create mode 100644 superset-frontend/images/icons/cog.svg create mode 100644 superset-frontend/images/icons/collapse.svg create mode 100644 superset-frontend/images/icons/color_palette.svg create mode 100644 superset-frontend/images/icons/components.svg create mode 100644 superset-frontend/images/icons/copy.svg create mode 100644 superset-frontend/images/icons/cursor_target.svg rename superset-frontend/images/icons/{databases.svg => database.svg} (94%) create mode 100644 superset-frontend/images/icons/dataset_virtual_greyscale.svg create mode 100644 superset-frontend/images/icons/download.svg delete mode 100644 superset-frontend/images/icons/dropdown-arrow.svg create mode 100644 superset-frontend/images/icons/edit.svg rename superset-frontend/images/icons/{pencil.svg => edit_alt.svg} (100%) create mode 100644 superset-frontend/images/icons/email.svg create mode 100644 superset-frontend/images/icons/error_solid.svg create mode 100644 superset-frontend/images/icons/error_solid_small.svg create mode 100644 superset-frontend/images/icons/expand.svg create mode 100644 superset-frontend/images/icons/eye.svg create mode 100644 superset-frontend/images/icons/eye_slash.svg create mode 100644 superset-frontend/images/icons/favorite_small_selected.svg create mode 100644 superset-frontend/images/icons/field_abc.svg create mode 100644 superset-frontend/images/icons/field_boolean.svg create mode 100644 superset-frontend/images/icons/field_date.svg create mode 100644 superset-frontend/images/icons/field_derived.svg create mode 100644 superset-frontend/images/icons/field_num.svg create mode 100644 superset-frontend/images/icons/field_struct.svg create mode 100644 superset-frontend/images/icons/file.svg create mode 100644 superset-frontend/images/icons/filter.svg create mode 100644 superset-frontend/images/icons/folder.svg create mode 100644 superset-frontend/images/icons/full.svg create mode 100644 superset-frontend/images/icons/gear.svg create mode 100644 superset-frontend/images/icons/grid.svg create mode 100644 superset-frontend/images/icons/image.svg create mode 100644 superset-frontend/images/icons/info-solid.svg create mode 100644 superset-frontend/images/icons/info.svg create mode 100644 superset-frontend/images/icons/info_solid_small.svg create mode 100644 superset-frontend/images/icons/join.svg create mode 100644 superset-frontend/images/icons/keyboard.svg create mode 100644 superset-frontend/images/icons/layers.svg create mode 100644 superset-frontend/images/icons/lightbulb.svg create mode 100644 superset-frontend/images/icons/list.svg rename superset-frontend/images/icons/{list-view.svg => list_view.svg} (100%) create mode 100644 superset-frontend/images/icons/location.svg create mode 100644 superset-frontend/images/icons/lock_locked.svg create mode 100644 superset-frontend/images/icons/lock_unlocked.svg create mode 100644 superset-frontend/images/icons/map.svg create mode 100644 superset-frontend/images/icons/message.svg create mode 100644 superset-frontend/images/icons/minus.svg create mode 100644 superset-frontend/images/icons/minus_solid.svg rename superset-frontend/images/icons/{more.svg => more_horiz.svg} (100%) create mode 100644 superset-frontend/images/icons/move.svg create mode 100644 superset-frontend/images/icons/nav_charts.svg create mode 100644 superset-frontend/images/icons/nav_dashboard.svg create mode 100644 superset-frontend/images/icons/nav_data.svg rename superset-frontend/images/icons/{compass.svg => nav_explore.svg} (100%) create mode 100644 superset-frontend/images/icons/nav_home.svg create mode 100644 superset-frontend/images/icons/nav_lab.svg create mode 100644 superset-frontend/images/icons/note.svg create mode 100644 superset-frontend/images/icons/paperclip.svg create mode 100644 superset-frontend/images/icons/placeholder.svg create mode 100644 superset-frontend/images/icons/plus.svg create mode 100644 superset-frontend/images/icons/plus_large.svg create mode 100644 superset-frontend/images/icons/plus_small.svg create mode 100644 superset-frontend/images/icons/plus_solid.svg create mode 100644 superset-frontend/images/icons/refresh.svg create mode 100644 superset-frontend/images/icons/server.svg rename superset-frontend/images/icons/{sort-asc.svg => sort_asc.svg} (100%) rename superset-frontend/images/icons/{sort-desc.svg => sort_desc.svg} (100%) create mode 100644 superset-frontend/images/icons/sql.svg create mode 100644 superset-frontend/images/icons/table.svg create mode 100644 superset-frontend/images/icons/tag.svg create mode 100644 superset-frontend/images/icons/triangle_change.svg create mode 100644 superset-frontend/images/icons/triangle_down.svg create mode 100644 superset-frontend/images/icons/triangle_up.svg create mode 100644 superset-frontend/images/icons/up-level.svg create mode 100644 superset-frontend/images/icons/user.svg rename superset-frontend/images/icons/{circle-check.svg => warning_solid.svg} (56%) create mode 100644 superset-frontend/images/icons/x-large.svg create mode 100644 superset-frontend/images/icons/x-small.svg diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js index 6202eb9f853e6..464b377e89ef7 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js +++ b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js @@ -23,7 +23,7 @@ describe('Dashboard edit mode', () => { cy.server(); cy.login(); cy.visit(WORLD_HEALTH_DASHBOARD); - cy.get('.dashboard-header [data-test=pencil]').click(); + cy.get('.dashboard-header [data-test=edit-alt]').click(); }); it('remove, and add chart flow', () => { diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts index a5f470fa52dd4..4f8fb84fb5a5c 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts @@ -30,7 +30,7 @@ describe('Dashboard edit markdown', () => { cy.get('script').then(nodes => { numScripts = nodes.length; }); - cy.get('.dashboard-header [data-test=pencil]').click(); + cy.get('.dashboard-header [data-test=edit-alt]').click(); cy.get('script').then(nodes => { // load 5 new script chunks for css editor expect(nodes.length).to.greaterThan(numScripts); diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js index 028a2366d2acb..811e7c0767711 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js +++ b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js @@ -53,7 +53,7 @@ describe('Dashboard save action', () => { cy.get('.grid-container .box_plot', { timeout: 5000 }); // wait for 5 secs // remove box_plot chart from dashboard - cy.get('.dashboard-header [data-test=pencil]').click(); + cy.get('.dashboard-header [data-test=edit-alt]').click(); cy.get('.fa.fa-trash').last().trigger('click', { force: true }); cy.get('.grid-container .box_plot').should('not.exist'); @@ -64,7 +64,7 @@ describe('Dashboard save action', () => { // go back to view mode cy.wait('@saveRequest'); - cy.get('.dashboard-header [data-test=pencil]').click(); + cy.get('.dashboard-header [data-test=edit-alt]').click(); cy.get('.grid-container .box_plot').should('not.exist'); }); }); diff --git a/superset-frontend/images/icons/alert.svg b/superset-frontend/images/icons/alert.svg new file mode 100644 index 0000000000000..71638ce70fba3 --- /dev/null +++ b/superset-frontend/images/icons/alert.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/alert_solid.svg b/superset-frontend/images/icons/alert_solid.svg new file mode 100644 index 0000000000000..a7f1551c3f845 --- /dev/null +++ b/superset-frontend/images/icons/alert_solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/binoculars.svg b/superset-frontend/images/icons/binoculars.svg new file mode 100644 index 0000000000000..abef243921148 --- /dev/null +++ b/superset-frontend/images/icons/binoculars.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/bolt.svg b/superset-frontend/images/icons/bolt.svg new file mode 100644 index 0000000000000..be1d7133ab0ea --- /dev/null +++ b/superset-frontend/images/icons/bolt.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/bolt_small.svg b/superset-frontend/images/icons/bolt_small.svg new file mode 100644 index 0000000000000..0f56c10267c18 --- /dev/null +++ b/superset-frontend/images/icons/bolt_small.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/bolt_small_run.svg b/superset-frontend/images/icons/bolt_small_run.svg new file mode 100644 index 0000000000000..3690ab1c72f88 --- /dev/null +++ b/superset-frontend/images/icons/bolt_small_run.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/calendar.svg b/superset-frontend/images/icons/calendar.svg new file mode 100644 index 0000000000000..3b39c1da8072f --- /dev/null +++ b/superset-frontend/images/icons/calendar.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/cancel.svg b/superset-frontend/images/icons/cancel.svg new file mode 100644 index 0000000000000..561503bcbf04f --- /dev/null +++ b/superset-frontend/images/icons/cancel.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/cancel_solid.svg b/superset-frontend/images/icons/cancel_solid.svg new file mode 100644 index 0000000000000..c0f03e6f189cd --- /dev/null +++ b/superset-frontend/images/icons/cancel_solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/card-view.svg b/superset-frontend/images/icons/card_view.svg similarity index 100% rename from superset-frontend/images/icons/card-view.svg rename to superset-frontend/images/icons/card_view.svg diff --git a/superset-frontend/images/icons/cards.svg b/superset-frontend/images/icons/cards.svg new file mode 100644 index 0000000000000..be59ec53a47e9 --- /dev/null +++ b/superset-frontend/images/icons/cards.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/cards_locked.svg b/superset-frontend/images/icons/cards_locked.svg new file mode 100644 index 0000000000000..522ddf986890c --- /dev/null +++ b/superset-frontend/images/icons/cards_locked.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/caret_down.svg b/superset-frontend/images/icons/caret_down.svg new file mode 100644 index 0000000000000..0ffc7e5cf1eb0 --- /dev/null +++ b/superset-frontend/images/icons/caret_down.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/caret_left.svg b/superset-frontend/images/icons/caret_left.svg new file mode 100644 index 0000000000000..d43471dcc5192 --- /dev/null +++ b/superset-frontend/images/icons/caret_left.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/caret_right.svg b/superset-frontend/images/icons/caret_right.svg new file mode 100644 index 0000000000000..4ab4545c6dd6a --- /dev/null +++ b/superset-frontend/images/icons/caret_right.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/caret_up.svg b/superset-frontend/images/icons/caret_up.svg new file mode 100644 index 0000000000000..c854683c071d6 --- /dev/null +++ b/superset-frontend/images/icons/caret_up.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/checkbox-half.svg b/superset-frontend/images/icons/checkbox-half.svg index 50411b421591f..e7850ba345de5 100644 --- a/superset-frontend/images/icons/checkbox-half.svg +++ b/superset-frontend/images/icons/checkbox-half.svg @@ -17,6 +17,6 @@ under the License. --> - + diff --git a/superset-frontend/images/icons/checkbox-off.svg b/superset-frontend/images/icons/checkbox-off.svg index 5835c1893dca8..6b9e5ea32c2d4 100644 --- a/superset-frontend/images/icons/checkbox-off.svg +++ b/superset-frontend/images/icons/checkbox-off.svg @@ -17,5 +17,5 @@ under the License. --> - + diff --git a/superset-frontend/images/icons/checkbox-on.svg b/superset-frontend/images/icons/checkbox-on.svg index 25e82d5e2a4e5..e114734368c85 100644 --- a/superset-frontend/images/icons/checkbox-on.svg +++ b/superset-frontend/images/icons/checkbox-on.svg @@ -17,6 +17,6 @@ under the License. --> - + diff --git a/superset-frontend/images/icons/circle.svg b/superset-frontend/images/icons/circle.svg new file mode 100644 index 0000000000000..bc2bcd40977b4 --- /dev/null +++ b/superset-frontend/images/icons/circle.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/circle_check.svg b/superset-frontend/images/icons/circle_check.svg new file mode 100644 index 0000000000000..46f3ce5e7ce1a --- /dev/null +++ b/superset-frontend/images/icons/circle_check.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/circle-check-solid.svg b/superset-frontend/images/icons/circle_check_solid.svg similarity index 100% rename from superset-frontend/images/icons/circle-check-solid.svg rename to superset-frontend/images/icons/circle_check_solid.svg diff --git a/superset-frontend/images/icons/clock.svg b/superset-frontend/images/icons/clock.svg new file mode 100644 index 0000000000000..f6597972091a1 --- /dev/null +++ b/superset-frontend/images/icons/clock.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/code.svg b/superset-frontend/images/icons/code.svg new file mode 100644 index 0000000000000..ae413cc881188 --- /dev/null +++ b/superset-frontend/images/icons/code.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/cog.svg b/superset-frontend/images/icons/cog.svg new file mode 100644 index 0000000000000..0b5f64bde9d65 --- /dev/null +++ b/superset-frontend/images/icons/cog.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/collapse.svg b/superset-frontend/images/icons/collapse.svg new file mode 100644 index 0000000000000..7282252a256cf --- /dev/null +++ b/superset-frontend/images/icons/collapse.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/color_palette.svg b/superset-frontend/images/icons/color_palette.svg new file mode 100644 index 0000000000000..3fc0413268c40 --- /dev/null +++ b/superset-frontend/images/icons/color_palette.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/components.svg b/superset-frontend/images/icons/components.svg new file mode 100644 index 0000000000000..46f67e4514826 --- /dev/null +++ b/superset-frontend/images/icons/components.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/copy.svg b/superset-frontend/images/icons/copy.svg new file mode 100644 index 0000000000000..b6c569d0b40cc --- /dev/null +++ b/superset-frontend/images/icons/copy.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/cursor_target.svg b/superset-frontend/images/icons/cursor_target.svg new file mode 100644 index 0000000000000..99a81817de0b1 --- /dev/null +++ b/superset-frontend/images/icons/cursor_target.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/databases.svg b/superset-frontend/images/icons/database.svg similarity index 94% rename from superset-frontend/images/icons/databases.svg rename to superset-frontend/images/icons/database.svg index 3464e04d7a6ea..bb8c9a99937b9 100644 --- a/superset-frontend/images/icons/databases.svg +++ b/superset-frontend/images/icons/database.svg @@ -17,5 +17,5 @@ under the License. --> - + diff --git a/superset-frontend/images/icons/dataset_virtual_greyscale.svg b/superset-frontend/images/icons/dataset_virtual_greyscale.svg new file mode 100644 index 0000000000000..927ee8462d263 --- /dev/null +++ b/superset-frontend/images/icons/dataset_virtual_greyscale.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/download.svg b/superset-frontend/images/icons/download.svg new file mode 100644 index 0000000000000..732fe39bb71e9 --- /dev/null +++ b/superset-frontend/images/icons/download.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/dropdown-arrow.svg b/superset-frontend/images/icons/dropdown-arrow.svg deleted file mode 100644 index 1d0d8b35c8199..0000000000000 --- a/superset-frontend/images/icons/dropdown-arrow.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/superset-frontend/images/icons/edit.svg b/superset-frontend/images/icons/edit.svg new file mode 100644 index 0000000000000..a732b45373e06 --- /dev/null +++ b/superset-frontend/images/icons/edit.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/pencil.svg b/superset-frontend/images/icons/edit_alt.svg similarity index 100% rename from superset-frontend/images/icons/pencil.svg rename to superset-frontend/images/icons/edit_alt.svg diff --git a/superset-frontend/images/icons/email.svg b/superset-frontend/images/icons/email.svg new file mode 100644 index 0000000000000..5eb707833dae6 --- /dev/null +++ b/superset-frontend/images/icons/email.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/error.svg b/superset-frontend/images/icons/error.svg index b619c4876c8f8..0cb50fddcf290 100644 --- a/superset-frontend/images/icons/error.svg +++ b/superset-frontend/images/icons/error.svg @@ -1,22 +1,21 @@ - - - + + diff --git a/superset-frontend/images/icons/error_solid.svg b/superset-frontend/images/icons/error_solid.svg new file mode 100644 index 0000000000000..b619c4876c8f8 --- /dev/null +++ b/superset-frontend/images/icons/error_solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/error_solid_small.svg b/superset-frontend/images/icons/error_solid_small.svg new file mode 100644 index 0000000000000..c28efde2eb7de --- /dev/null +++ b/superset-frontend/images/icons/error_solid_small.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/expand.svg b/superset-frontend/images/icons/expand.svg new file mode 100644 index 0000000000000..02a26916c59c1 --- /dev/null +++ b/superset-frontend/images/icons/expand.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/eye.svg b/superset-frontend/images/icons/eye.svg new file mode 100644 index 0000000000000..262d9bb6d9070 --- /dev/null +++ b/superset-frontend/images/icons/eye.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/eye_slash.svg b/superset-frontend/images/icons/eye_slash.svg new file mode 100644 index 0000000000000..fad4969a45f88 --- /dev/null +++ b/superset-frontend/images/icons/eye_slash.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/favorite-selected.svg b/superset-frontend/images/icons/favorite-selected.svg index fe831f0b56128..83985610ca7bd 100644 --- a/superset-frontend/images/icons/favorite-selected.svg +++ b/superset-frontend/images/icons/favorite-selected.svg @@ -16,6 +16,6 @@ specific language governing permissions and limitations under the License. --> - - + + diff --git a/superset-frontend/images/icons/favorite-unselected.svg b/superset-frontend/images/icons/favorite-unselected.svg index caf51951cba1a..0a4054756d370 100644 --- a/superset-frontend/images/icons/favorite-unselected.svg +++ b/superset-frontend/images/icons/favorite-unselected.svg @@ -16,6 +16,6 @@ specific language governing permissions and limitations under the License. --> - - + + diff --git a/superset-frontend/images/icons/favorite_small_selected.svg b/superset-frontend/images/icons/favorite_small_selected.svg new file mode 100644 index 0000000000000..9ce5802aecf67 --- /dev/null +++ b/superset-frontend/images/icons/favorite_small_selected.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_abc.svg b/superset-frontend/images/icons/field_abc.svg new file mode 100644 index 0000000000000..ce519516c8803 --- /dev/null +++ b/superset-frontend/images/icons/field_abc.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_boolean.svg b/superset-frontend/images/icons/field_boolean.svg new file mode 100644 index 0000000000000..a804e7d9faa5a --- /dev/null +++ b/superset-frontend/images/icons/field_boolean.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_date.svg b/superset-frontend/images/icons/field_date.svg new file mode 100644 index 0000000000000..cf796fab70b9b --- /dev/null +++ b/superset-frontend/images/icons/field_date.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_derived.svg b/superset-frontend/images/icons/field_derived.svg new file mode 100644 index 0000000000000..00e2115bf4863 --- /dev/null +++ b/superset-frontend/images/icons/field_derived.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_num.svg b/superset-frontend/images/icons/field_num.svg new file mode 100644 index 0000000000000..69b6aa2e337ed --- /dev/null +++ b/superset-frontend/images/icons/field_num.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/field_struct.svg b/superset-frontend/images/icons/field_struct.svg new file mode 100644 index 0000000000000..8877592f56553 --- /dev/null +++ b/superset-frontend/images/icons/field_struct.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/file.svg b/superset-frontend/images/icons/file.svg new file mode 100644 index 0000000000000..5484d710ba458 --- /dev/null +++ b/superset-frontend/images/icons/file.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/filter.svg b/superset-frontend/images/icons/filter.svg new file mode 100644 index 0000000000000..f762e26de0eaa --- /dev/null +++ b/superset-frontend/images/icons/filter.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/folder.svg b/superset-frontend/images/icons/folder.svg new file mode 100644 index 0000000000000..969153876efe7 --- /dev/null +++ b/superset-frontend/images/icons/folder.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/full.svg b/superset-frontend/images/icons/full.svg new file mode 100644 index 0000000000000..b194f4c7b2bf1 --- /dev/null +++ b/superset-frontend/images/icons/full.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/gear.svg b/superset-frontend/images/icons/gear.svg new file mode 100644 index 0000000000000..f76f97f473a31 --- /dev/null +++ b/superset-frontend/images/icons/gear.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/grid.svg b/superset-frontend/images/icons/grid.svg new file mode 100644 index 0000000000000..b128c3fe50404 --- /dev/null +++ b/superset-frontend/images/icons/grid.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/image.svg b/superset-frontend/images/icons/image.svg new file mode 100644 index 0000000000000..dd06cb303c7a5 --- /dev/null +++ b/superset-frontend/images/icons/image.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/info-solid.svg b/superset-frontend/images/icons/info-solid.svg new file mode 100644 index 0000000000000..2ac0b766822a1 --- /dev/null +++ b/superset-frontend/images/icons/info-solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/info.svg b/superset-frontend/images/icons/info.svg new file mode 100644 index 0000000000000..6d1820568fb78 --- /dev/null +++ b/superset-frontend/images/icons/info.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/info_solid_small.svg b/superset-frontend/images/icons/info_solid_small.svg new file mode 100644 index 0000000000000..ea18a0b3812be --- /dev/null +++ b/superset-frontend/images/icons/info_solid_small.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/join.svg b/superset-frontend/images/icons/join.svg new file mode 100644 index 0000000000000..c1b2d9cf4b932 --- /dev/null +++ b/superset-frontend/images/icons/join.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/keyboard.svg b/superset-frontend/images/icons/keyboard.svg new file mode 100644 index 0000000000000..7b7801242e44d --- /dev/null +++ b/superset-frontend/images/icons/keyboard.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/layers.svg b/superset-frontend/images/icons/layers.svg new file mode 100644 index 0000000000000..6e23b437ed4ac --- /dev/null +++ b/superset-frontend/images/icons/layers.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/lightbulb.svg b/superset-frontend/images/icons/lightbulb.svg new file mode 100644 index 0000000000000..8df86d487179a --- /dev/null +++ b/superset-frontend/images/icons/lightbulb.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/list.svg b/superset-frontend/images/icons/list.svg new file mode 100644 index 0000000000000..c31be33c67084 --- /dev/null +++ b/superset-frontend/images/icons/list.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/list-view.svg b/superset-frontend/images/icons/list_view.svg similarity index 100% rename from superset-frontend/images/icons/list-view.svg rename to superset-frontend/images/icons/list_view.svg diff --git a/superset-frontend/images/icons/location.svg b/superset-frontend/images/icons/location.svg new file mode 100644 index 0000000000000..830ad90053d2b --- /dev/null +++ b/superset-frontend/images/icons/location.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/lock_locked.svg b/superset-frontend/images/icons/lock_locked.svg new file mode 100644 index 0000000000000..192974687b132 --- /dev/null +++ b/superset-frontend/images/icons/lock_locked.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/lock_unlocked.svg b/superset-frontend/images/icons/lock_unlocked.svg new file mode 100644 index 0000000000000..f7768d89c87f0 --- /dev/null +++ b/superset-frontend/images/icons/lock_unlocked.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/map.svg b/superset-frontend/images/icons/map.svg new file mode 100644 index 0000000000000..c8bcf692f578f --- /dev/null +++ b/superset-frontend/images/icons/map.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/message.svg b/superset-frontend/images/icons/message.svg new file mode 100644 index 0000000000000..57ac4a6b74308 --- /dev/null +++ b/superset-frontend/images/icons/message.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/minus.svg b/superset-frontend/images/icons/minus.svg new file mode 100644 index 0000000000000..22e0744034859 --- /dev/null +++ b/superset-frontend/images/icons/minus.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/minus_solid.svg b/superset-frontend/images/icons/minus_solid.svg new file mode 100644 index 0000000000000..f34bb7127d9b8 --- /dev/null +++ b/superset-frontend/images/icons/minus_solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/more.svg b/superset-frontend/images/icons/more_horiz.svg similarity index 100% rename from superset-frontend/images/icons/more.svg rename to superset-frontend/images/icons/more_horiz.svg diff --git a/superset-frontend/images/icons/move.svg b/superset-frontend/images/icons/move.svg new file mode 100644 index 0000000000000..bec9182e64523 --- /dev/null +++ b/superset-frontend/images/icons/move.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/nav_charts.svg b/superset-frontend/images/icons/nav_charts.svg new file mode 100644 index 0000000000000..e4faf06745b35 --- /dev/null +++ b/superset-frontend/images/icons/nav_charts.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/nav_dashboard.svg b/superset-frontend/images/icons/nav_dashboard.svg new file mode 100644 index 0000000000000..b14b337114f78 --- /dev/null +++ b/superset-frontend/images/icons/nav_dashboard.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/nav_data.svg b/superset-frontend/images/icons/nav_data.svg new file mode 100644 index 0000000000000..96fe26eeb313c --- /dev/null +++ b/superset-frontend/images/icons/nav_data.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/compass.svg b/superset-frontend/images/icons/nav_explore.svg similarity index 100% rename from superset-frontend/images/icons/compass.svg rename to superset-frontend/images/icons/nav_explore.svg diff --git a/superset-frontend/images/icons/nav_home.svg b/superset-frontend/images/icons/nav_home.svg new file mode 100644 index 0000000000000..2c02850d1fa8b --- /dev/null +++ b/superset-frontend/images/icons/nav_home.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/nav_lab.svg b/superset-frontend/images/icons/nav_lab.svg new file mode 100644 index 0000000000000..340d4d9e52f95 --- /dev/null +++ b/superset-frontend/images/icons/nav_lab.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/note.svg b/superset-frontend/images/icons/note.svg new file mode 100644 index 0000000000000..01819bbbb9d4a --- /dev/null +++ b/superset-frontend/images/icons/note.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/paperclip.svg b/superset-frontend/images/icons/paperclip.svg new file mode 100644 index 0000000000000..c3df450333d26 --- /dev/null +++ b/superset-frontend/images/icons/paperclip.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/placeholder.svg b/superset-frontend/images/icons/placeholder.svg new file mode 100644 index 0000000000000..bf1ed56064ad5 --- /dev/null +++ b/superset-frontend/images/icons/placeholder.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/plus.svg b/superset-frontend/images/icons/plus.svg new file mode 100644 index 0000000000000..539379e884d44 --- /dev/null +++ b/superset-frontend/images/icons/plus.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/plus_large.svg b/superset-frontend/images/icons/plus_large.svg new file mode 100644 index 0000000000000..4ffdb6912b3bd --- /dev/null +++ b/superset-frontend/images/icons/plus_large.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/plus_small.svg b/superset-frontend/images/icons/plus_small.svg new file mode 100644 index 0000000000000..efe61a5082dd5 --- /dev/null +++ b/superset-frontend/images/icons/plus_small.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/plus_solid.svg b/superset-frontend/images/icons/plus_solid.svg new file mode 100644 index 0000000000000..3601cdf8b7704 --- /dev/null +++ b/superset-frontend/images/icons/plus_solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/refresh.svg b/superset-frontend/images/icons/refresh.svg new file mode 100644 index 0000000000000..6e5fc9eab6976 --- /dev/null +++ b/superset-frontend/images/icons/refresh.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/server.svg b/superset-frontend/images/icons/server.svg new file mode 100644 index 0000000000000..f7842a8298d43 --- /dev/null +++ b/superset-frontend/images/icons/server.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/sort-asc.svg b/superset-frontend/images/icons/sort_asc.svg similarity index 100% rename from superset-frontend/images/icons/sort-asc.svg rename to superset-frontend/images/icons/sort_asc.svg diff --git a/superset-frontend/images/icons/sort-desc.svg b/superset-frontend/images/icons/sort_desc.svg similarity index 100% rename from superset-frontend/images/icons/sort-desc.svg rename to superset-frontend/images/icons/sort_desc.svg diff --git a/superset-frontend/images/icons/sql.svg b/superset-frontend/images/icons/sql.svg new file mode 100644 index 0000000000000..a15a5cb2542d1 --- /dev/null +++ b/superset-frontend/images/icons/sql.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/table.svg b/superset-frontend/images/icons/table.svg new file mode 100644 index 0000000000000..fca912377e412 --- /dev/null +++ b/superset-frontend/images/icons/table.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/images/icons/tag.svg b/superset-frontend/images/icons/tag.svg new file mode 100644 index 0000000000000..2abb55d326ce9 --- /dev/null +++ b/superset-frontend/images/icons/tag.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/triangle_change.svg b/superset-frontend/images/icons/triangle_change.svg new file mode 100644 index 0000000000000..f06c145618b59 --- /dev/null +++ b/superset-frontend/images/icons/triangle_change.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/triangle_down.svg b/superset-frontend/images/icons/triangle_down.svg new file mode 100644 index 0000000000000..24bcdf2c66740 --- /dev/null +++ b/superset-frontend/images/icons/triangle_down.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/triangle_up.svg b/superset-frontend/images/icons/triangle_up.svg new file mode 100644 index 0000000000000..e8cfa2476f5de --- /dev/null +++ b/superset-frontend/images/icons/triangle_up.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/up-level.svg b/superset-frontend/images/icons/up-level.svg new file mode 100644 index 0000000000000..29e2eaafb69d0 --- /dev/null +++ b/superset-frontend/images/icons/up-level.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/user.svg b/superset-frontend/images/icons/user.svg new file mode 100644 index 0000000000000..774c9be767d5f --- /dev/null +++ b/superset-frontend/images/icons/user.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/warning.svg b/superset-frontend/images/icons/warning.svg index 118955914f538..cfe3b089a9934 100644 --- a/superset-frontend/images/icons/warning.svg +++ b/superset-frontend/images/icons/warning.svg @@ -1,22 +1,21 @@ - - + diff --git a/superset-frontend/images/icons/circle-check.svg b/superset-frontend/images/icons/warning_solid.svg similarity index 56% rename from superset-frontend/images/icons/circle-check.svg rename to superset-frontend/images/icons/warning_solid.svg index 2eb41a2dd310b..118955914f538 100644 --- a/superset-frontend/images/icons/circle-check.svg +++ b/superset-frontend/images/icons/warning_solid.svg @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> - + - + diff --git a/superset-frontend/images/icons/x-large.svg b/superset-frontend/images/icons/x-large.svg new file mode 100644 index 0000000000000..d96e5e02de6bb --- /dev/null +++ b/superset-frontend/images/icons/x-large.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/images/icons/x-small.svg b/superset-frontend/images/icons/x-small.svg new file mode 100644 index 0000000000000..6d2fb53b7e368 --- /dev/null +++ b/superset-frontend/images/icons/x-small.svg @@ -0,0 +1,21 @@ + + + + diff --git a/superset-frontend/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx index baa997ef21885..38723587ff658 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx @@ -125,7 +125,7 @@ describe('ChartList', () => { it('edits', () => { expect(wrapper.find(PropertiesModal)).not.toExist(); - wrapper.find('[data-test="pencil"]').first().simulate('click'); + wrapper.find('[data-test="edit-alt"]').first().simulate('click'); expect(wrapper.find(PropertiesModal)).toExist(); }); diff --git a/superset-frontend/spec/javascripts/views/CRUD/dashboard/DashboardList_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/dashboard/DashboardList_spec.jsx index fbc9c1ddffd8b..d493f3d4c9c58 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/dashboard/DashboardList_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/dashboard/DashboardList_spec.jsx @@ -118,12 +118,12 @@ describe('DashboardList', () => { it('edits', () => { expect(wrapper.find(PropertiesModal)).not.toExist(); - wrapper.find('[data-test="pencil"]').first().simulate('click'); + wrapper.find('[data-test="edit-alt"]').first().simulate('click'); expect(wrapper.find(PropertiesModal)).toExist(); }); it('card view edits', () => { - wrapper.find('[data-test="pencil"]').last().simulate('click'); + wrapper.find('[data-test="edit-alt"]').last().simulate('click'); expect(wrapper.find(PropertiesModal)).toExist(); }); diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx index 1bd97e0d8a93a..8f7b8b233f660 100644 --- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx +++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx @@ -111,7 +111,7 @@ export default function ErrorAlert({ {title} @@ -162,7 +162,7 @@ export default function ErrorAlert({
{title}
diff --git a/superset-frontend/src/components/FaveStar.tsx b/superset-frontend/src/components/FaveStar.tsx index 992506bd5a708..2dba97ca86956 100644 --- a/superset-frontend/src/components/FaveStar.tsx +++ b/superset-frontend/src/components/FaveStar.tsx @@ -59,7 +59,6 @@ export default class FaveStar extends React.PureComponent { ? 'favorite-selected' : 'favorite-unselected' } - viewBox="0 0 16 15" width={this.props.width || 20} height={this.props.height || 'auto'} /> @@ -78,7 +77,6 @@ export default class FaveStar extends React.PureComponent { name={ this.props.isStarred ? 'favorite-selected' : 'favorite-unselected' } - viewBox="0 0 16 15" width={this.props.width || 20} height={this.props.height || 'auto'} /> diff --git a/superset-frontend/src/components/Icon/icon.stories.jsx b/superset-frontend/src/components/Icon/icon.stories.jsx index 76b67d9a4bf85..b6a04d212a535 100644 --- a/superset-frontend/src/components/Icon/icon.stories.jsx +++ b/superset-frontend/src/components/Icon/icon.stories.jsx @@ -67,7 +67,7 @@ export const SupersetIcon = () => { {Object.keys(iconsRegistry) .sort() .map(iconName => ( - + > > = { + 'alert-solid': AlertSolidIcon, + alert: AlertIcon, + binoculars: BinocularsIcon, + 'bolt-small-run': BoltSmallRunIcon, + 'bolt-small': BoltSmallIcon, + bolt: BoltIcon, + calendar: CalendarIcon, + 'cancel-solid': CancelSolidIcon, 'cancel-x': CancelXIcon, + cancel: CancelIcon, 'card-view': CardViewIcon, + 'cards-locked': CardsLockedIcon, + cards: CardsIcon, + 'caret-down': CaretDownIcon, + 'caret-left': CaretLeftIcon, + 'caret-right': CaretRightIcon, + 'caret-up': CaretUpIcon, + certified: CertifiedIcon, + check: CheckIcon, 'checkbox-half': CheckboxHalfIcon, 'checkbox-off': CheckboxOffIcon, 'checkbox-on': CheckboxOnIcon, 'circle-check-solid': CircleCheckSolidIcon, 'circle-check': CircleCheckIcon, - databases: DatabasesIcon, + circle: CircleIcon, + clock: ClockIcon, + close: CloseIcon, + code: CodeIcon, + cog: CogIcon, + collapse: CollapseIcon, + 'color-palette': ColorPaletteIcon, + components: ComponentsIcon, + copy: CopyIcon, + 'cursor-target': CursorTargeIcon, + database: DatabaseIcon, 'dataset-physical': DatasetPhysicalIcon, + 'dataset-virtual-greyscale': DatasetVirtualGreyscaleIcon, 'dataset-virtual': DatasetVirtualIcon, + download: DownloadIcon, + 'edit-alt': EditAltIcon, + edit: EditIcon, + email: EmailIcon, + 'error-solid-small': ErrorSolidSmallIcon, + 'error-solid': ErrorSolidIcon, + error: ErrorIcon, + expand: ExpandIcon, + 'eye-slash': EyeSlashIcon, + eye: EyeIcon, + 'favorite-small-selected': FavoriteSmallSelectedIcon, 'favorite-selected': FavoriteSelectedIcon, 'favorite-unselected': FavoriteUnselectedIcon, + 'field-abc': FieldABCIcon, + 'field-boolean': FieldBooleanIcon, + 'field-date': FieldDateIcon, + 'field-derived': FieldDerivedIcon, + 'field-num': FieldNumIcon, + 'field-struct': FieldStructIcon, + file: FileIcon, + filter: FilterIcon, + folder: FolderIcon, + full: FullIcon, + gear: GearIcon, + grid: GridIcon, + image: ImageIcon, + 'info-solid-small': InfoSolidSmallIcon, + 'info-solid': InfoSolidIcon, + info: InfoIcon, + join: JoinIcon, + keyboard: KeyboardIcon, + layers: LayersIcon, + lightbulb: LightbulbIcon, 'list-view': ListViewIcon, - 'dropdown-arrow': DropdownArrowIcon, - 'sort-asc': SortAscIcon, - 'sort-desc': SortDescIcon, - certified: CertifiedIcon, - check: CheckIcon, - close: CloseIcon, - compass: CompassIcon, - error: ErrorIcon, - more: MoreIcon, - pencil: PencilIcon, + list: ListIcon, + location: LocationIcon, + 'lock-locked': LockLockedIcon, + 'lock-unlocked': LockUnlockedIcon, + map: MapIcon, + message: MessageIcon, + 'minus-solid': MinusSolidIcon, + minus: MinusIcon, + 'more-horiz': MoreHorizIcon, + move: MoveIcon, + 'nav-charts': NavChartsIcon, + 'nav-dashboard': NavDashboardIcon, + 'nav-data': NavDataIcon, + 'nav-explore': NavExploreIcon, + 'nav-home': NavHomeIcon, + 'nav-lab': NavLabIcon, + note: NoteIcon, + paperclip: PaperclipIcon, + placeholder: PlaceholderIcon, + 'plus-large': PlusLargeIcon, + 'plus-small': PlusSmallIcon, + 'plus-solid': PlusSolidIcon, + plus: PlusIcon, + refresh: RefreshIcon, search: SearchIcon, + server: ServerIcon, share: ShareIcon, + 'sort-asc': SortAscIcon, + 'sort-desc': SortDescIcon, sort: SortIcon, + sql: SQLIcon, + table: TableIcon, + tag: TagIcon, trash: TrashIcon, + 'triangle-change': TriangleChangeIcon, + 'triangle-down': TriangleDownIcon, + 'triangle-up': TriangleUpIcon, + 'up-level': UpLevelIcon, + user: UserIcon, + 'warning-solid': WarningSolidIcon, warning: WarningIcon, + 'x-large': XLargeIcon, + 'x-small': XSmallIcon, }; interface IconProps extends SVGProps { diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx index 29d4eae1fe221..2af54957b0dac 100644 --- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx +++ b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx @@ -75,12 +75,12 @@ export const SupersetListViewCard = () => { Delete - Edit + Edit } > - + } diff --git a/superset-frontend/src/components/NavDropdown/index.tsx b/superset-frontend/src/components/NavDropdown/index.tsx index f4b9f6cabca95..2b5d82aabe08e 100644 --- a/superset-frontend/src/components/NavDropdown/index.tsx +++ b/superset-frontend/src/components/NavDropdown/index.tsx @@ -33,16 +33,16 @@ const NavDropdown = styled(ReactBootstrapNavDropdown)` :after { content: ''; - height: ${({ theme }) => theme.gridUnit}px; - width: ${({ theme }) => theme.gridUnit * 2}px; - background: url('/static/assets/images/icons/dropdown-arrow.svg'); + height: ${({ theme }) => theme.gridUnit * 6}px; + width: ${({ theme }) => theme.gridUnit * 6}px; + background: url('/static/assets/images/icons/triangle_down.svg'); background-size: contain; background-position: center center; background-repeat: no-repeat; position: absolute; top: 50%; transform: translateY(-50%); - right: ${({ theme }) => theme.gridUnit * 2}px; + right: ${({ theme }) => theme.gridUnit}px; transition: opacity ${({ theme }) => theme.transitionTiming}s; opacity: ${({ theme }) => theme.opacity.mediumLight}; pointer-events: none; diff --git a/superset-frontend/src/dashboard/components/Header.jsx b/superset-frontend/src/dashboard/components/Header.jsx index 596bd19d32726..c986a314a9816 100644 --- a/superset-frontend/src/dashboard/components/Header.jsx +++ b/superset-frontend/src/dashboard/components/Header.jsx @@ -103,7 +103,7 @@ const defaultProps = { const StyledDashboardHeader = styled.div` button, .fave-unfave-icon { - margin-left: 8px; + margin-left: ${({ theme }) => theme.gridUnit * 2}px; } `; @@ -444,7 +444,7 @@ class Header extends React.PureComponent { className="action-button" onClick={this.toggleEditMode} > - + )} diff --git a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx index c99e164bc3848..fae6899094673 100644 --- a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx +++ b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx @@ -146,7 +146,7 @@ class HeaderActionsDropdown extends React.PureComponent { return ( } + title={} noCaret id="save-dash-split-button" bsSize="small" diff --git a/superset-frontend/src/explore/main.less b/superset-frontend/src/explore/main.less index 4ca4a763ae0a6..fe64c11a1910c 100644 --- a/superset-frontend/src/explore/main.less +++ b/superset-frontend/src/explore/main.less @@ -36,7 +36,6 @@ margin-bottom: 40px; } -.fave-unfave-icon, .edit-desc-icon { padding: 0 0 0 0.5em; font-size: @font-size-m; diff --git a/superset-frontend/src/messageToasts/components/Toast.tsx b/superset-frontend/src/messageToasts/components/Toast.tsx index c14fc999fabce..5b06fa68b9240 100644 --- a/superset-frontend/src/messageToasts/components/Toast.tsx +++ b/superset-frontend/src/messageToasts/components/Toast.tsx @@ -87,7 +87,7 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) { )} {toast.toastType === WARNING_TOAST || - (toast.toastType === DANGER_TOAST && )} + (toast.toastType === DANGER_TOAST && )} diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx index 79f136fb0fd82..69f1c5179476a 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx @@ -297,7 +297,7 @@ function ChartList(props: ChartListProps) { className="action-button" onClick={openEditModal} > - + )} @@ -423,7 +423,7 @@ function ChartList(props: ChartListProps) { tabIndex={0} onClick={() => openChartEditModal(chart)} > - Edit + Edit )} @@ -454,7 +454,7 @@ function ChartList(props: ChartListProps) { {renderFaveStar(chart.id)} - + } diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx index 983e14c818c9c..90416b398722d 100644 --- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx +++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx @@ -315,7 +315,7 @@ function DashboardList(props: DashboardListProps) { className="action-button" onClick={handleEdit} > - + )} @@ -453,7 +453,7 @@ function DashboardList(props: DashboardListProps) { tabIndex={0} onClick={() => openDashboardEditModal(dashboard)} > - Edit + Edit )} @@ -487,7 +487,7 @@ function DashboardList(props: DashboardListProps) { {renderFaveStar(dashboard.id)} - + } diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx index be1e0acded49b..4162fcfe59e7e 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx @@ -253,7 +253,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) { className="action-button" onClick={handleEdit} > - + )} diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx index b7827bfcc0298..0b2074f157eaf 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx @@ -294,7 +294,7 @@ const DatabaseModal: FunctionComponent = ({ show={show} title={

- + {isEditMode ? t('Edit Database') : t('Add Database')}

} diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index a74bf6232ed54..9edd4db55e9a8 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -115,7 +115,7 @@ const DatasetModal: FunctionComponent = ({ show={show} title={ <> - + {t('Add Dataset')} } diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index 533eb1866c13b..bae6a5a2e664e 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -271,7 +271,7 @@ const DatasetList: FunctionComponent = ({ className="action-button" href={original.explore_url} > - + {canDelete && ( @@ -303,7 +303,7 @@ const DatasetList: FunctionComponent = ({ className="action-button" onClick={handleEdit} > - + )} diff --git a/superset-frontend/stylesheets/superset.less b/superset-frontend/stylesheets/superset.less index 1665199dc5f82..3ad2e728d5136 100644 --- a/superset-frontend/stylesheets/superset.less +++ b/superset-frontend/stylesheets/superset.less @@ -525,17 +525,6 @@ tr.reactable-column-header th.reactable-header-sortable { padding-right: 17px; } -.fave-unfave-icon { - .fa-star-o, - .fa-star { - &, - &:hover, - &:active { - color: @almost-black; - } - } -} - .metric-edit-popover-label-input { border-radius: @border-radius-large; height: 30px;