From 940b48ccf82f6dcdf3651b0190fef620807ef35a Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:39:55 -0700 Subject: [PATCH 01/29] error -> error-solid --- .../images/icons/{error.svg => error_solid.svg} | 0 .../src/components/ErrorMessage/ErrorAlert.tsx | 4 ++-- superset-frontend/src/components/Icon/index.tsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename superset-frontend/images/icons/{error.svg => error_solid.svg} (100%) diff --git a/superset-frontend/images/icons/error.svg b/superset-frontend/images/icons/error_solid.svg similarity index 100% rename from superset-frontend/images/icons/error.svg rename to superset-frontend/images/icons/error_solid.svg diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx index 1bd97e0d8a93a..99923f37ff475 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/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index f033fd81341f1..408fcd878aceb 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -32,7 +32,7 @@ import { ReactComponent as DatabasesIcon } from 'images/icons/databases.svg'; import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_physical.svg'; import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg'; import { ReactComponent as DropdownArrowIcon } from 'images/icons/dropdown-arrow.svg'; -import { ReactComponent as ErrorIcon } from 'images/icons/error.svg'; +import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg'; import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg'; import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; import { ReactComponent as ListViewIcon } from 'images/icons/list-view.svg'; @@ -62,7 +62,7 @@ type IconName = | 'dataset-physical' | 'dataset-virtual' | 'dropdown-arrow' - | 'error' + | 'error-solid' | 'favorite-selected' | 'favorite-unselected' | 'list-view' @@ -100,7 +100,7 @@ export const iconsRegistry: Record< check: CheckIcon, close: CloseIcon, compass: CompassIcon, - error: ErrorIcon, + 'error-solid': ErrorSolidIcon, more: MoreIcon, pencil: PencilIcon, search: SearchIcon, From 8d3dee7eb7f2ab03fa5e5a6f0c54ca1bb955c9c9 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:44:45 -0700 Subject: [PATCH 02/29] warning -> warning-solid --- superset-frontend/images/icons/error.svg | 3 +++ .../images/icons/warning-solid.svg | 22 +++++++++++++++++++ .../components/ErrorMessage/ErrorAlert.tsx | 4 ++-- .../src/components/Icon/index.tsx | 6 ++--- 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 superset-frontend/images/icons/error.svg create mode 100644 superset-frontend/images/icons/warning-solid.svg diff --git a/superset-frontend/images/icons/error.svg b/superset-frontend/images/icons/error.svg new file mode 100644 index 0000000000000..fe93c9ccdf91a --- /dev/null +++ b/superset-frontend/images/icons/error.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/warning-solid.svg b/superset-frontend/images/icons/warning-solid.svg new file mode 100644 index 0000000000000..118955914f538 --- /dev/null +++ b/superset-frontend/images/icons/warning-solid.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx index 99923f37ff475..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/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 408fcd878aceb..4ec9abc0ba9fa 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -44,7 +44,7 @@ import { ReactComponent as SortAscIcon } from 'images/icons/sort-asc.svg'; import { ReactComponent as SortDescIcon } from 'images/icons/sort-desc.svg'; import { ReactComponent as SortIcon } from 'images/icons/sort.svg'; import { ReactComponent as TrashIcon } from 'images/icons/trash.svg'; -import { ReactComponent as WarningIcon } from 'images/icons/warning.svg'; +import { ReactComponent as WarningSolidIcon } from 'images/icons/warning_solid.svg'; type IconName = | 'cancel-x' @@ -74,7 +74,7 @@ type IconName = | 'sort-desc' | 'sort' | 'trash' - | 'warning'; + | 'warning-solid'; export const iconsRegistry: Record< IconName, @@ -107,7 +107,7 @@ export const iconsRegistry: Record< share: ShareIcon, sort: SortIcon, trash: TrashIcon, - warning: WarningIcon, + 'warning-solid': WarningSolidIcon, }; interface IconProps extends SVGProps { From 0c9ec92b63fd6acd7b8f9b4908ea0deeb3d5db4a Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:45:22 -0700 Subject: [PATCH 03/29] all the new icons mixed in! --- superset-frontend/images/icons/alert.svg | 3 +++ .../images/icons/alert_solid.svg | 4 ++++ superset-frontend/images/icons/binoculars.svg | 3 +++ superset-frontend/images/icons/bolt.svg | 3 +++ superset-frontend/images/icons/bolt_small.svg | 3 +++ .../images/icons/bolt_small_run.svg | 3 +++ superset-frontend/images/icons/calendar.svg | 3 +++ superset-frontend/images/icons/cancel.svg | 3 +++ .../images/icons/cancel_solid.svg | 4 ++++ superset-frontend/images/icons/card_view.svg | 3 +++ superset-frontend/images/icons/cards.svg | 3 +++ .../images/icons/cards_locked.svg | 4 ++++ superset-frontend/images/icons/caret_down.svg | 3 +++ superset-frontend/images/icons/caret_left.svg | 3 +++ .../images/icons/caret_right.svg | 3 +++ superset-frontend/images/icons/caret_up.svg | 3 +++ superset-frontend/images/icons/circle.svg | 3 +++ .../images/icons/circle_check.svg | 3 +++ .../images/icons/circle_check_solid.svg | 4 ++++ superset-frontend/images/icons/clock.svg | 3 +++ superset-frontend/images/icons/code.svg | 3 +++ superset-frontend/images/icons/cog.svg | 4 ++++ superset-frontend/images/icons/collapse.svg | 3 +++ .../images/icons/color_palette.svg | 3 +++ superset-frontend/images/icons/components.svg | 4 ++++ superset-frontend/images/icons/copy.svg | 3 +++ .../images/icons/cursor_target.svg | 3 +++ .../icons/dataset_virtual_greyscale.svg | 4 ++++ superset-frontend/images/icons/db_full.svg | 3 +++ superset-frontend/images/icons/download.svg | 3 +++ superset-frontend/images/icons/edit.svg | 3 +++ superset-frontend/images/icons/edit_alt.svg | 3 +++ superset-frontend/images/icons/email.svg | 3 +++ .../images/icons/error_solid_small.svg | 4 ++++ superset-frontend/images/icons/expand.svg | 3 +++ superset-frontend/images/icons/eye.svg | 3 +++ superset-frontend/images/icons/eye_slash.svg | 3 +++ superset-frontend/images/icons/field_abc.svg | 3 +++ .../images/icons/field_boolean.svg | 3 +++ superset-frontend/images/icons/field_date.svg | 3 +++ .../images/icons/field_derived.svg | 3 +++ superset-frontend/images/icons/field_num.svg | 3 +++ .../images/icons/field_struct.svg | 3 +++ superset-frontend/images/icons/file.svg | 3 +++ superset-frontend/images/icons/filter.svg | 3 +++ superset-frontend/images/icons/folder.svg | 3 +++ superset-frontend/images/icons/full.svg | 3 +++ superset-frontend/images/icons/gear.svg | 3 +++ superset-frontend/images/icons/grid.svg | 3 +++ superset-frontend/images/icons/image.svg | 3 +++ superset-frontend/images/icons/info-solid.svg | 4 ++++ superset-frontend/images/icons/info.svg | 3 +++ .../images/icons/info_solid_small.svg | 4 ++++ superset-frontend/images/icons/join.svg | 3 +++ superset-frontend/images/icons/keyboard.svg | 3 +++ superset-frontend/images/icons/layers.svg | 3 +++ superset-frontend/images/icons/lightbulb.svg | 3 +++ superset-frontend/images/icons/list.svg | 3 +++ superset-frontend/images/icons/location.svg | 3 +++ .../images/icons/lock_locked.svg | 3 +++ .../images/icons/lock_unlocked.svg | 3 +++ superset-frontend/images/icons/map.svg | 3 +++ superset-frontend/images/icons/message.svg | 3 +++ superset-frontend/images/icons/minus.svg | 3 +++ .../images/icons/minus_solid.svg | 4 ++++ superset-frontend/images/icons/more_horiz.svg | 3 +++ superset-frontend/images/icons/move.svg | 3 +++ superset-frontend/images/icons/nav_charts.svg | 4 ++++ .../images/icons/nav_dashboard.svg | 3 +++ superset-frontend/images/icons/nav_data.svg | 3 +++ .../images/icons/nav_explore.svg | 4 ++++ superset-frontend/images/icons/nav_home.svg | 3 +++ superset-frontend/images/icons/nav_lab.svg | 3 +++ superset-frontend/images/icons/note.svg | 3 +++ superset-frontend/images/icons/paperclip.svg | 3 +++ .../images/icons/placeholder.svg | 3 +++ superset-frontend/images/icons/plus.svg | 3 +++ superset-frontend/images/icons/plus_large.svg | 3 +++ superset-frontend/images/icons/plus_small.svg | 3 +++ superset-frontend/images/icons/plus_solid.svg | 4 ++++ superset-frontend/images/icons/refresh.svg | 3 +++ superset-frontend/images/icons/server.svg | 3 +++ superset-frontend/images/icons/sort_orted.svg | 4 ++++ superset-frontend/images/icons/sql.svg | 4 ++++ .../images/icons/star_selected.svg | 3 +++ .../images/icons/star_small_selected.svg | 3 +++ .../images/icons/star_unselected.svg | 3 +++ superset-frontend/images/icons/table.svg | 4 ++++ superset-frontend/images/icons/tag.svg | 3 +++ .../images/icons/triangle_change.svg | 3 +++ .../images/icons/triangle_down.svg | 3 +++ .../images/icons/triangle_up.svg | 3 +++ superset-frontend/images/icons/up-level.svg | 3 +++ superset-frontend/images/icons/user.svg | 3 +++ superset-frontend/images/icons/warning.svg | 21 +------------------ superset-frontend/images/icons/x-large.svg | 3 +++ superset-frontend/images/icons/x-small.svg | 3 +++ 97 files changed, 306 insertions(+), 20 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 create mode 100644 superset-frontend/images/icons/card_view.svg 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 create mode 100644 superset-frontend/images/icons/circle_check_solid.svg 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 create mode 100644 superset-frontend/images/icons/dataset_virtual_greyscale.svg create mode 100644 superset-frontend/images/icons/db_full.svg create mode 100644 superset-frontend/images/icons/download.svg create mode 100644 superset-frontend/images/icons/edit.svg create mode 100644 superset-frontend/images/icons/edit_alt.svg create mode 100644 superset-frontend/images/icons/email.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/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 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 create mode 100644 superset-frontend/images/icons/more_horiz.svg 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 create mode 100644 superset-frontend/images/icons/nav_explore.svg 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 create mode 100644 superset-frontend/images/icons/sort_orted.svg create mode 100644 superset-frontend/images/icons/sql.svg create mode 100644 superset-frontend/images/icons/star_selected.svg create mode 100644 superset-frontend/images/icons/star_small_selected.svg create mode 100644 superset-frontend/images/icons/star_unselected.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 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/images/icons/alert.svg b/superset-frontend/images/icons/alert.svg new file mode 100644 index 0000000000000..bb6910f112d34 --- /dev/null +++ b/superset-frontend/images/icons/alert.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/alert_solid.svg b/superset-frontend/images/icons/alert_solid.svg new file mode 100644 index 0000000000000..2da21967b55db --- /dev/null +++ b/superset-frontend/images/icons/alert_solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/binoculars.svg b/superset-frontend/images/icons/binoculars.svg new file mode 100644 index 0000000000000..6919bca11717d --- /dev/null +++ b/superset-frontend/images/icons/binoculars.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/bolt.svg b/superset-frontend/images/icons/bolt.svg new file mode 100644 index 0000000000000..6b8741e976574 --- /dev/null +++ b/superset-frontend/images/icons/bolt.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/bolt_small.svg b/superset-frontend/images/icons/bolt_small.svg new file mode 100644 index 0000000000000..a98f0751d69a2 --- /dev/null +++ b/superset-frontend/images/icons/bolt_small.svg @@ -0,0 +1,3 @@ + + + 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..df5dd4715d465 --- /dev/null +++ b/superset-frontend/images/icons/bolt_small_run.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/calendar.svg b/superset-frontend/images/icons/calendar.svg new file mode 100644 index 0000000000000..295be7156aa2c --- /dev/null +++ b/superset-frontend/images/icons/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cancel.svg b/superset-frontend/images/icons/cancel.svg new file mode 100644 index 0000000000000..a149df199595f --- /dev/null +++ b/superset-frontend/images/icons/cancel.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cancel_solid.svg b/superset-frontend/images/icons/cancel_solid.svg new file mode 100644 index 0000000000000..791ef6ef9ca47 --- /dev/null +++ b/superset-frontend/images/icons/cancel_solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/card_view.svg b/superset-frontend/images/icons/card_view.svg new file mode 100644 index 0000000000000..986123451849c --- /dev/null +++ b/superset-frontend/images/icons/card_view.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cards.svg b/superset-frontend/images/icons/cards.svg new file mode 100644 index 0000000000000..7445aa209efa3 --- /dev/null +++ b/superset-frontend/images/icons/cards.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cards_locked.svg b/superset-frontend/images/icons/cards_locked.svg new file mode 100644 index 0000000000000..d09ad0faa3869 --- /dev/null +++ b/superset-frontend/images/icons/cards_locked.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/caret_down.svg b/superset-frontend/images/icons/caret_down.svg new file mode 100644 index 0000000000000..29ce19efa80b9 --- /dev/null +++ b/superset-frontend/images/icons/caret_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/caret_left.svg b/superset-frontend/images/icons/caret_left.svg new file mode 100644 index 0000000000000..cdea2bfeadd31 --- /dev/null +++ b/superset-frontend/images/icons/caret_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/caret_right.svg b/superset-frontend/images/icons/caret_right.svg new file mode 100644 index 0000000000000..aafc5bd85682c --- /dev/null +++ b/superset-frontend/images/icons/caret_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/caret_up.svg b/superset-frontend/images/icons/caret_up.svg new file mode 100644 index 0000000000000..fc8002c5f7291 --- /dev/null +++ b/superset-frontend/images/icons/caret_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/circle.svg b/superset-frontend/images/icons/circle.svg new file mode 100644 index 0000000000000..526e51015c52b --- /dev/null +++ b/superset-frontend/images/icons/circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/circle_check.svg b/superset-frontend/images/icons/circle_check.svg new file mode 100644 index 0000000000000..dacdb03e26ea5 --- /dev/null +++ b/superset-frontend/images/icons/circle_check.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/circle_check_solid.svg b/superset-frontend/images/icons/circle_check_solid.svg new file mode 100644 index 0000000000000..9560dd315f723 --- /dev/null +++ b/superset-frontend/images/icons/circle_check_solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/clock.svg b/superset-frontend/images/icons/clock.svg new file mode 100644 index 0000000000000..ab2bfa4b5e6c2 --- /dev/null +++ b/superset-frontend/images/icons/clock.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/code.svg b/superset-frontend/images/icons/code.svg new file mode 100644 index 0000000000000..d23945b82421f --- /dev/null +++ b/superset-frontend/images/icons/code.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cog.svg b/superset-frontend/images/icons/cog.svg new file mode 100644 index 0000000000000..7e00158d4675a --- /dev/null +++ b/superset-frontend/images/icons/cog.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/collapse.svg b/superset-frontend/images/icons/collapse.svg new file mode 100644 index 0000000000000..9548389dbccc0 --- /dev/null +++ b/superset-frontend/images/icons/collapse.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/color_palette.svg b/superset-frontend/images/icons/color_palette.svg new file mode 100644 index 0000000000000..da5d11739b7b0 --- /dev/null +++ b/superset-frontend/images/icons/color_palette.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/components.svg b/superset-frontend/images/icons/components.svg new file mode 100644 index 0000000000000..7102eff8812d1 --- /dev/null +++ b/superset-frontend/images/icons/components.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/copy.svg b/superset-frontend/images/icons/copy.svg new file mode 100644 index 0000000000000..7876679307134 --- /dev/null +++ b/superset-frontend/images/icons/copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/cursor_target.svg b/superset-frontend/images/icons/cursor_target.svg new file mode 100644 index 0000000000000..77219655a2f5d --- /dev/null +++ b/superset-frontend/images/icons/cursor_target.svg @@ -0,0 +1,3 @@ + + + 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..cce832a30467b --- /dev/null +++ b/superset-frontend/images/icons/dataset_virtual_greyscale.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/db_full.svg b/superset-frontend/images/icons/db_full.svg new file mode 100644 index 0000000000000..3a145ee3819ca --- /dev/null +++ b/superset-frontend/images/icons/db_full.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/download.svg b/superset-frontend/images/icons/download.svg new file mode 100644 index 0000000000000..70770e182e337 --- /dev/null +++ b/superset-frontend/images/icons/download.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/edit.svg b/superset-frontend/images/icons/edit.svg new file mode 100644 index 0000000000000..395a5b6b3c513 --- /dev/null +++ b/superset-frontend/images/icons/edit.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/edit_alt.svg b/superset-frontend/images/icons/edit_alt.svg new file mode 100644 index 0000000000000..932b7a2172468 --- /dev/null +++ b/superset-frontend/images/icons/edit_alt.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/email.svg b/superset-frontend/images/icons/email.svg new file mode 100644 index 0000000000000..398596c35cd73 --- /dev/null +++ b/superset-frontend/images/icons/email.svg @@ -0,0 +1,3 @@ + + + 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..12b0dfe5a1064 --- /dev/null +++ b/superset-frontend/images/icons/error_solid_small.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/expand.svg b/superset-frontend/images/icons/expand.svg new file mode 100644 index 0000000000000..0cd5ff40436ba --- /dev/null +++ b/superset-frontend/images/icons/expand.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/eye.svg b/superset-frontend/images/icons/eye.svg new file mode 100644 index 0000000000000..7bac79ca5b6a6 --- /dev/null +++ b/superset-frontend/images/icons/eye.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/eye_slash.svg b/superset-frontend/images/icons/eye_slash.svg new file mode 100644 index 0000000000000..86a9d0c8671df --- /dev/null +++ b/superset-frontend/images/icons/eye_slash.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_abc.svg b/superset-frontend/images/icons/field_abc.svg new file mode 100644 index 0000000000000..9aee57c43b798 --- /dev/null +++ b/superset-frontend/images/icons/field_abc.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_boolean.svg b/superset-frontend/images/icons/field_boolean.svg new file mode 100644 index 0000000000000..87c9161c09926 --- /dev/null +++ b/superset-frontend/images/icons/field_boolean.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_date.svg b/superset-frontend/images/icons/field_date.svg new file mode 100644 index 0000000000000..9d4fb76221fec --- /dev/null +++ b/superset-frontend/images/icons/field_date.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_derived.svg b/superset-frontend/images/icons/field_derived.svg new file mode 100644 index 0000000000000..ea0cddb5cd8be --- /dev/null +++ b/superset-frontend/images/icons/field_derived.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_num.svg b/superset-frontend/images/icons/field_num.svg new file mode 100644 index 0000000000000..d1f41283fb487 --- /dev/null +++ b/superset-frontend/images/icons/field_num.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/field_struct.svg b/superset-frontend/images/icons/field_struct.svg new file mode 100644 index 0000000000000..2944d950ac71c --- /dev/null +++ b/superset-frontend/images/icons/field_struct.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/file.svg b/superset-frontend/images/icons/file.svg new file mode 100644 index 0000000000000..9a3a3e4a16d92 --- /dev/null +++ b/superset-frontend/images/icons/file.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/filter.svg b/superset-frontend/images/icons/filter.svg new file mode 100644 index 0000000000000..5b26f41d3c835 --- /dev/null +++ b/superset-frontend/images/icons/filter.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/folder.svg b/superset-frontend/images/icons/folder.svg new file mode 100644 index 0000000000000..a32fed314c688 --- /dev/null +++ b/superset-frontend/images/icons/folder.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/full.svg b/superset-frontend/images/icons/full.svg new file mode 100644 index 0000000000000..474e96d5a9e55 --- /dev/null +++ b/superset-frontend/images/icons/full.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/gear.svg b/superset-frontend/images/icons/gear.svg new file mode 100644 index 0000000000000..dbff781108e8e --- /dev/null +++ b/superset-frontend/images/icons/gear.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/grid.svg b/superset-frontend/images/icons/grid.svg new file mode 100644 index 0000000000000..071a91c445a71 --- /dev/null +++ b/superset-frontend/images/icons/grid.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/image.svg b/superset-frontend/images/icons/image.svg new file mode 100644 index 0000000000000..f5173ed9b7d83 --- /dev/null +++ b/superset-frontend/images/icons/image.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/info-solid.svg b/superset-frontend/images/icons/info-solid.svg new file mode 100644 index 0000000000000..7d9e45acc2703 --- /dev/null +++ b/superset-frontend/images/icons/info-solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/info.svg b/superset-frontend/images/icons/info.svg new file mode 100644 index 0000000000000..587243f30b97c --- /dev/null +++ b/superset-frontend/images/icons/info.svg @@ -0,0 +1,3 @@ + + + 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..93eed597636e0 --- /dev/null +++ b/superset-frontend/images/icons/info_solid_small.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/join.svg b/superset-frontend/images/icons/join.svg new file mode 100644 index 0000000000000..e1b48c694051e --- /dev/null +++ b/superset-frontend/images/icons/join.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/keyboard.svg b/superset-frontend/images/icons/keyboard.svg new file mode 100644 index 0000000000000..c6191e864445b --- /dev/null +++ b/superset-frontend/images/icons/keyboard.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/layers.svg b/superset-frontend/images/icons/layers.svg new file mode 100644 index 0000000000000..ff4b6f911792c --- /dev/null +++ b/superset-frontend/images/icons/layers.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/lightbulb.svg b/superset-frontend/images/icons/lightbulb.svg new file mode 100644 index 0000000000000..7458dd526623a --- /dev/null +++ b/superset-frontend/images/icons/lightbulb.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/list.svg b/superset-frontend/images/icons/list.svg new file mode 100644 index 0000000000000..c84c83f25f021 --- /dev/null +++ b/superset-frontend/images/icons/list.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/location.svg b/superset-frontend/images/icons/location.svg new file mode 100644 index 0000000000000..01b26fdf446b2 --- /dev/null +++ b/superset-frontend/images/icons/location.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/lock_locked.svg b/superset-frontend/images/icons/lock_locked.svg new file mode 100644 index 0000000000000..d27abf6f90d40 --- /dev/null +++ b/superset-frontend/images/icons/lock_locked.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/lock_unlocked.svg b/superset-frontend/images/icons/lock_unlocked.svg new file mode 100644 index 0000000000000..70db6a1784452 --- /dev/null +++ b/superset-frontend/images/icons/lock_unlocked.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/map.svg b/superset-frontend/images/icons/map.svg new file mode 100644 index 0000000000000..5185bb8f5b93c --- /dev/null +++ b/superset-frontend/images/icons/map.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/message.svg b/superset-frontend/images/icons/message.svg new file mode 100644 index 0000000000000..8ac9422da237f --- /dev/null +++ b/superset-frontend/images/icons/message.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/minus.svg b/superset-frontend/images/icons/minus.svg new file mode 100644 index 0000000000000..f013c75a511bf --- /dev/null +++ b/superset-frontend/images/icons/minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/minus_solid.svg b/superset-frontend/images/icons/minus_solid.svg new file mode 100644 index 0000000000000..170cb788fdca0 --- /dev/null +++ b/superset-frontend/images/icons/minus_solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/more_horiz.svg b/superset-frontend/images/icons/more_horiz.svg new file mode 100644 index 0000000000000..37dfd3a4cee7a --- /dev/null +++ b/superset-frontend/images/icons/more_horiz.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/move.svg b/superset-frontend/images/icons/move.svg new file mode 100644 index 0000000000000..d7eecf5507fed --- /dev/null +++ b/superset-frontend/images/icons/move.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/nav_charts.svg b/superset-frontend/images/icons/nav_charts.svg new file mode 100644 index 0000000000000..57bd1137555da --- /dev/null +++ b/superset-frontend/images/icons/nav_charts.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/nav_dashboard.svg b/superset-frontend/images/icons/nav_dashboard.svg new file mode 100644 index 0000000000000..6ae744ae2ee86 --- /dev/null +++ b/superset-frontend/images/icons/nav_dashboard.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/nav_data.svg b/superset-frontend/images/icons/nav_data.svg new file mode 100644 index 0000000000000..d84f0daac27be --- /dev/null +++ b/superset-frontend/images/icons/nav_data.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/nav_explore.svg b/superset-frontend/images/icons/nav_explore.svg new file mode 100644 index 0000000000000..05d894be0f51e --- /dev/null +++ b/superset-frontend/images/icons/nav_explore.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/nav_home.svg b/superset-frontend/images/icons/nav_home.svg new file mode 100644 index 0000000000000..ba456b4ce2aef --- /dev/null +++ b/superset-frontend/images/icons/nav_home.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/nav_lab.svg b/superset-frontend/images/icons/nav_lab.svg new file mode 100644 index 0000000000000..b35616e7beb4b --- /dev/null +++ b/superset-frontend/images/icons/nav_lab.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/note.svg b/superset-frontend/images/icons/note.svg new file mode 100644 index 0000000000000..1dd8eb84c0321 --- /dev/null +++ b/superset-frontend/images/icons/note.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/paperclip.svg b/superset-frontend/images/icons/paperclip.svg new file mode 100644 index 0000000000000..fbec2153d4d35 --- /dev/null +++ b/superset-frontend/images/icons/paperclip.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/placeholder.svg b/superset-frontend/images/icons/placeholder.svg new file mode 100644 index 0000000000000..eaef71538904e --- /dev/null +++ b/superset-frontend/images/icons/placeholder.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/plus.svg b/superset-frontend/images/icons/plus.svg new file mode 100644 index 0000000000000..0a83a9c50909a --- /dev/null +++ b/superset-frontend/images/icons/plus.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/plus_large.svg b/superset-frontend/images/icons/plus_large.svg new file mode 100644 index 0000000000000..d1f7821997a4c --- /dev/null +++ b/superset-frontend/images/icons/plus_large.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/plus_small.svg b/superset-frontend/images/icons/plus_small.svg new file mode 100644 index 0000000000000..415b30490e0ba --- /dev/null +++ b/superset-frontend/images/icons/plus_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/plus_solid.svg b/superset-frontend/images/icons/plus_solid.svg new file mode 100644 index 0000000000000..ab1dad4125670 --- /dev/null +++ b/superset-frontend/images/icons/plus_solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/refresh.svg b/superset-frontend/images/icons/refresh.svg new file mode 100644 index 0000000000000..377bd40ca5290 --- /dev/null +++ b/superset-frontend/images/icons/refresh.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/server.svg b/superset-frontend/images/icons/server.svg new file mode 100644 index 0000000000000..866c706eec384 --- /dev/null +++ b/superset-frontend/images/icons/server.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/sort_orted.svg b/superset-frontend/images/icons/sort_orted.svg new file mode 100644 index 0000000000000..6639c00a83fee --- /dev/null +++ b/superset-frontend/images/icons/sort_orted.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/sql.svg b/superset-frontend/images/icons/sql.svg new file mode 100644 index 0000000000000..96ebf96150bbb --- /dev/null +++ b/superset-frontend/images/icons/sql.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/star_selected.svg b/superset-frontend/images/icons/star_selected.svg new file mode 100644 index 0000000000000..9a02dc52e88e5 --- /dev/null +++ b/superset-frontend/images/icons/star_selected.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/star_small_selected.svg b/superset-frontend/images/icons/star_small_selected.svg new file mode 100644 index 0000000000000..b6ffef6116363 --- /dev/null +++ b/superset-frontend/images/icons/star_small_selected.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/star_unselected.svg b/superset-frontend/images/icons/star_unselected.svg new file mode 100644 index 0000000000000..9208241b4a3ef --- /dev/null +++ b/superset-frontend/images/icons/star_unselected.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/table.svg b/superset-frontend/images/icons/table.svg new file mode 100644 index 0000000000000..1aa5f36c6fb40 --- /dev/null +++ b/superset-frontend/images/icons/table.svg @@ -0,0 +1,4 @@ + + + + diff --git a/superset-frontend/images/icons/tag.svg b/superset-frontend/images/icons/tag.svg new file mode 100644 index 0000000000000..c653a20c86ef3 --- /dev/null +++ b/superset-frontend/images/icons/tag.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/triangle_change.svg b/superset-frontend/images/icons/triangle_change.svg new file mode 100644 index 0000000000000..b417ef1662d36 --- /dev/null +++ b/superset-frontend/images/icons/triangle_change.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/triangle_down.svg b/superset-frontend/images/icons/triangle_down.svg new file mode 100644 index 0000000000000..cbed28f213eb2 --- /dev/null +++ b/superset-frontend/images/icons/triangle_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/triangle_up.svg b/superset-frontend/images/icons/triangle_up.svg new file mode 100644 index 0000000000000..716e515a4e7c6 --- /dev/null +++ b/superset-frontend/images/icons/triangle_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/up-level.svg b/superset-frontend/images/icons/up-level.svg new file mode 100644 index 0000000000000..cc90052b74e11 --- /dev/null +++ b/superset-frontend/images/icons/up-level.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/user.svg b/superset-frontend/images/icons/user.svg new file mode 100644 index 0000000000000..f4c5fb33af5d1 --- /dev/null +++ b/superset-frontend/images/icons/user.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/warning.svg b/superset-frontend/images/icons/warning.svg index 118955914f538..709fff83564e0 100644 --- a/superset-frontend/images/icons/warning.svg +++ b/superset-frontend/images/icons/warning.svg @@ -1,22 +1,3 @@ - - - + diff --git a/superset-frontend/images/icons/x-large.svg b/superset-frontend/images/icons/x-large.svg new file mode 100644 index 0000000000000..b8a1c113539e4 --- /dev/null +++ b/superset-frontend/images/icons/x-large.svg @@ -0,0 +1,3 @@ + + + diff --git a/superset-frontend/images/icons/x-small.svg b/superset-frontend/images/icons/x-small.svg new file mode 100644 index 0000000000000..9623f542040db --- /dev/null +++ b/superset-frontend/images/icons/x-small.svg @@ -0,0 +1,3 @@ + + + From 7d84a9dd6c9c0255d108fd68c4a13f22458144a0 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:47:01 -0700 Subject: [PATCH 04/29] card-view -> card_view --- superset-frontend/images/icons/card-view.svg | 21 ------------------- superset-frontend/images/icons/card_view.svg | 20 +++++++++++++++++- .../src/components/Icon/index.tsx | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 superset-frontend/images/icons/card-view.svg diff --git a/superset-frontend/images/icons/card-view.svg b/superset-frontend/images/icons/card-view.svg deleted file mode 100644 index 009409b59491e..0000000000000 --- a/superset-frontend/images/icons/card-view.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/superset-frontend/images/icons/card_view.svg b/superset-frontend/images/icons/card_view.svg index 986123451849c..009409b59491e 100644 --- a/superset-frontend/images/icons/card_view.svg +++ b/superset-frontend/images/icons/card_view.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 4ec9abc0ba9fa..2da80c12643ac 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -18,7 +18,7 @@ */ import React, { SVGProps } from 'react'; import { ReactComponent as CancelXIcon } from 'images/icons/cancel-x.svg'; -import { ReactComponent as CardViewIcon } from 'images/icons/card-view.svg'; +import { ReactComponent as CardViewIcon } from 'images/icons/card_view.svg'; import { ReactComponent as CertifiedIcon } from 'images/icons/certified.svg'; import { ReactComponent as CheckboxHalfIcon } from 'images/icons/checkbox-half.svg'; import { ReactComponent as CheckboxOffIcon } from 'images/icons/checkbox-off.svg'; From f12c19c35b2c48c1cb3197b3351188e12b621f21 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:51:51 -0700 Subject: [PATCH 05/29] circle-check-solid -> circle_check_solid --- .../images/icons/circle-check-solid.svg | 22 ------------------- .../images/icons/circle_check_solid.svg | 20 ++++++++++++++++- .../src/components/Icon/index.tsx | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 superset-frontend/images/icons/circle-check-solid.svg diff --git a/superset-frontend/images/icons/circle-check-solid.svg b/superset-frontend/images/icons/circle-check-solid.svg deleted file mode 100644 index 0f1daba0d5097..0000000000000 --- a/superset-frontend/images/icons/circle-check-solid.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/superset-frontend/images/icons/circle_check_solid.svg b/superset-frontend/images/icons/circle_check_solid.svg index 9560dd315f723..0f1daba0d5097 100644 --- a/superset-frontend/images/icons/circle_check_solid.svg +++ b/superset-frontend/images/icons/circle_check_solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 2da80c12643ac..20ca8391e7c5f 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -25,7 +25,7 @@ import { ReactComponent as CheckboxOffIcon } from 'images/icons/checkbox-off.svg import { ReactComponent as CheckboxOnIcon } from 'images/icons/checkbox-on.svg'; import { ReactComponent as CheckIcon } from 'images/icons/check.svg'; import { ReactComponent as CircleCheckIcon } from 'images/icons/circle-check.svg'; -import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle-check-solid.svg'; +import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg'; import { ReactComponent as CloseIcon } from 'images/icons/close.svg'; import { ReactComponent as CompassIcon } from 'images/icons/compass.svg'; import { ReactComponent as DatabasesIcon } from 'images/icons/databases.svg'; From 9307d5403baaa2bf52a57b2d0b8910bc44917b1d Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 21:54:55 -0700 Subject: [PATCH 06/29] corrected circle-check to new name and correct (stroke) icon --- .../images/icons/circle-check.svg | 22 ------------------- .../images/icons/circle_check.svg | 20 ++++++++++++++++- .../src/components/Icon/index.tsx | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 superset-frontend/images/icons/circle-check.svg diff --git a/superset-frontend/images/icons/circle-check.svg b/superset-frontend/images/icons/circle-check.svg deleted file mode 100644 index 2eb41a2dd310b..0000000000000 --- a/superset-frontend/images/icons/circle-check.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/superset-frontend/images/icons/circle_check.svg b/superset-frontend/images/icons/circle_check.svg index dacdb03e26ea5..46f3ce5e7ce1a 100644 --- a/superset-frontend/images/icons/circle_check.svg +++ b/superset-frontend/images/icons/circle_check.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 20ca8391e7c5f..93ebab4ae3cb2 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -24,7 +24,7 @@ import { ReactComponent as CheckboxHalfIcon } from 'images/icons/checkbox-half.s import { ReactComponent as CheckboxOffIcon } from 'images/icons/checkbox-off.svg'; import { ReactComponent as CheckboxOnIcon } from 'images/icons/checkbox-on.svg'; import { ReactComponent as CheckIcon } from 'images/icons/check.svg'; -import { ReactComponent as CircleCheckIcon } from 'images/icons/circle-check.svg'; +import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg'; import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg'; import { ReactComponent as CloseIcon } from 'images/icons/close.svg'; import { ReactComponent as CompassIcon } from 'images/icons/compass.svg'; From 2baa30b78aa4a9ea97087ebb42c5b5960c796d94 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 22:06:01 -0700 Subject: [PATCH 07/29] sort-asc/desc -> sort_asc/desc --- superset-frontend/images/icons/{sort-asc.svg => sort_asc.svg} | 0 .../images/icons/{sort-desc.svg => sort_desc.svg} | 0 .../images/icons/{sort_orted.svg => sort_sorted.svg} | 0 superset-frontend/src/components/Icon/index.tsx | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename superset-frontend/images/icons/{sort-asc.svg => sort_asc.svg} (100%) rename superset-frontend/images/icons/{sort-desc.svg => sort_desc.svg} (100%) rename superset-frontend/images/icons/{sort_orted.svg => sort_sorted.svg} (100%) 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/sort_orted.svg b/superset-frontend/images/icons/sort_sorted.svg similarity index 100% rename from superset-frontend/images/icons/sort_orted.svg rename to superset-frontend/images/icons/sort_sorted.svg diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 93ebab4ae3cb2..f9054990325f8 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -40,8 +40,8 @@ import { ReactComponent as MoreIcon } from 'images/icons/more.svg'; import { ReactComponent as PencilIcon } from 'images/icons/pencil.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; import { ReactComponent as ShareIcon } from 'images/icons/share.svg'; -import { ReactComponent as SortAscIcon } from 'images/icons/sort-asc.svg'; -import { ReactComponent as SortDescIcon } from 'images/icons/sort-desc.svg'; +import { ReactComponent as SortAscIcon } from 'images/icons/sort_asc.svg'; +import { ReactComponent as SortDescIcon } from 'images/icons/sort_desc.svg'; import { ReactComponent as SortIcon } from 'images/icons/sort.svg'; import { ReactComponent as TrashIcon } from 'images/icons/trash.svg'; import { ReactComponent as WarningSolidIcon } from 'images/icons/warning_solid.svg'; From ce525214afe4513cf3246dd17e582918d4c38881 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 22:11:39 -0700 Subject: [PATCH 08/29] databases -> database --- .../images/icons/{databases.svg => database.svg} | 0 superset-frontend/images/icons/db_full.svg | 3 --- superset-frontend/src/components/Icon/index.tsx | 6 +++--- .../src/views/CRUD/data/database/DatabaseModal.tsx | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) rename superset-frontend/images/icons/{databases.svg => database.svg} (100%) delete mode 100644 superset-frontend/images/icons/db_full.svg diff --git a/superset-frontend/images/icons/databases.svg b/superset-frontend/images/icons/database.svg similarity index 100% rename from superset-frontend/images/icons/databases.svg rename to superset-frontend/images/icons/database.svg diff --git a/superset-frontend/images/icons/db_full.svg b/superset-frontend/images/icons/db_full.svg deleted file mode 100644 index 3a145ee3819ca..0000000000000 --- a/superset-frontend/images/icons/db_full.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index f9054990325f8..d09c1e6dd57e8 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -28,7 +28,7 @@ import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg'; import { ReactComponent as CloseIcon } from 'images/icons/close.svg'; import { ReactComponent as CompassIcon } from 'images/icons/compass.svg'; -import { ReactComponent as DatabasesIcon } from 'images/icons/databases.svg'; +import { ReactComponent as DatabaseIcon } from 'images/icons/database.svg'; import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_physical.svg'; import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg'; import { ReactComponent as DropdownArrowIcon } from 'images/icons/dropdown-arrow.svg'; @@ -58,7 +58,7 @@ type IconName = | 'circle-check' | 'close' | 'compass' - | 'databases' + | 'database' | 'dataset-physical' | 'dataset-virtual' | 'dropdown-arrow' @@ -87,7 +87,7 @@ export const iconsRegistry: Record< 'checkbox-on': CheckboxOnIcon, 'circle-check-solid': CircleCheckSolidIcon, 'circle-check': CircleCheckIcon, - databases: DatabasesIcon, + database: DatabaseIcon, 'dataset-physical': DatasetPhysicalIcon, 'dataset-virtual': DatasetVirtualIcon, 'favorite-selected': FavoriteSelectedIcon, 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')}

} From 1ca2740867f1338f3837896f45e6ddbac2d8f419 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 10 Sep 2020 22:14:53 -0700 Subject: [PATCH 09/29] compass -> nav_explore --- superset-frontend/images/icons/compass.svg | 22 ------------------- .../images/icons/nav_explore.svg | 22 +++++++++++++++++-- .../src/components/Icon/index.tsx | 6 ++--- .../views/CRUD/data/dataset/DatasetList.tsx | 2 +- 4 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 superset-frontend/images/icons/compass.svg diff --git a/superset-frontend/images/icons/compass.svg b/superset-frontend/images/icons/compass.svg deleted file mode 100644 index 7775d9b73b981..0000000000000 --- a/superset-frontend/images/icons/compass.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/superset-frontend/images/icons/nav_explore.svg b/superset-frontend/images/icons/nav_explore.svg index 05d894be0f51e..7775d9b73b981 100644 --- a/superset-frontend/images/icons/nav_explore.svg +++ b/superset-frontend/images/icons/nav_explore.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index d09c1e6dd57e8..293466d24c1f9 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -27,7 +27,7 @@ import { ReactComponent as CheckIcon } from 'images/icons/check.svg'; import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg'; import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg'; import { ReactComponent as CloseIcon } from 'images/icons/close.svg'; -import { ReactComponent as CompassIcon } from 'images/icons/compass.svg'; +import { ReactComponent as NavExploreIcon } from 'images/icons/nav_explore.svg'; import { ReactComponent as DatabaseIcon } from 'images/icons/database.svg'; import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_physical.svg'; import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg'; @@ -57,7 +57,7 @@ type IconName = | 'circle-check-solid' | 'circle-check' | 'close' - | 'compass' + | 'nav-explore' | 'database' | 'dataset-physical' | 'dataset-virtual' @@ -99,7 +99,7 @@ export const iconsRegistry: Record< certified: CertifiedIcon, check: CheckIcon, close: CloseIcon, - compass: CompassIcon, + 'nav-explore': NavExploreIcon, 'error-solid': ErrorSolidIcon, more: MoreIcon, pencil: PencilIcon, diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index 533eb1866c13b..018972357c478 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 && ( From b8165340ba8d827b3036d34fec46fdd6a24087a1 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Fri, 11 Sep 2020 23:21:01 -0700 Subject: [PATCH 10/29] pencil -> edit-alt --- .../integration/dashboard/save.test.js | 4 ++-- superset-frontend/images/icons/edit_alt.svg | 20 +++++++++++++++++- superset-frontend/images/icons/pencil.svg | 21 ------------------- .../CRUD/dashboard/DashboardList_spec.jsx | 4 ++-- .../src/components/Icon/index.tsx | 6 +++--- .../ListViewCard/ListViewCard.stories.tsx | 2 +- .../src/dashboard/components/Header.jsx | 2 +- .../src/views/CRUD/chart/ChartList.tsx | 4 ++-- .../views/CRUD/dashboard/DashboardList.tsx | 4 ++-- .../views/CRUD/data/dataset/DatasetList.tsx | 2 +- 10 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 superset-frontend/images/icons/pencil.svg 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/edit_alt.svg b/superset-frontend/images/icons/edit_alt.svg index 932b7a2172468..0cf5c9280adb6 100644 --- a/superset-frontend/images/icons/edit_alt.svg +++ b/superset-frontend/images/icons/edit_alt.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/pencil.svg b/superset-frontend/images/icons/pencil.svg deleted file mode 100644 index 0cf5c9280adb6..0000000000000 --- a/superset-frontend/images/icons/pencil.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - 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 f5c18d3a36a45..452b068cf3884 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/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 293466d24c1f9..385dba6725901 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -37,7 +37,7 @@ import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-se import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; import { ReactComponent as ListViewIcon } from 'images/icons/list-view.svg'; import { ReactComponent as MoreIcon } from 'images/icons/more.svg'; -import { ReactComponent as PencilIcon } from 'images/icons/pencil.svg'; +import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; import { ReactComponent as ShareIcon } from 'images/icons/share.svg'; import { ReactComponent as SortAscIcon } from 'images/icons/sort_asc.svg'; @@ -67,7 +67,7 @@ type IconName = | 'favorite-unselected' | 'list-view' | 'more' - | 'pencil' + | 'edit-alt' | 'search' | 'share' | 'sort-asc' @@ -102,7 +102,7 @@ export const iconsRegistry: Record< 'nav-explore': NavExploreIcon, 'error-solid': ErrorSolidIcon, more: MoreIcon, - pencil: PencilIcon, + "edit-alt": EditAltIcon, search: SearchIcon, share: ShareIcon, sort: SortIcon, diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx index 29d4eae1fe221..134ef589e5f4f 100644 --- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx +++ b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx @@ -75,7 +75,7 @@ export const SupersetListViewCard = () => { Delete - Edit + Edit } diff --git a/superset-frontend/src/dashboard/components/Header.jsx b/superset-frontend/src/dashboard/components/Header.jsx index 55f94aed938a3..1befed2392f34 100644 --- a/superset-frontend/src/dashboard/components/Header.jsx +++ b/superset-frontend/src/dashboard/components/Header.jsx @@ -444,7 +444,7 @@ class Header extends React.PureComponent { className="action-button" onClick={this.toggleEditMode} > - + )} diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx index 022295fa01845..1b1eca7f12044 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 )} diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx index 36873536ea7c8..8f68648c9551f 100644 --- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx +++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx @@ -302,7 +302,7 @@ function DashboardList(props: DashboardListProps) { className="action-button" onClick={handleEdit} > - + )} @@ -420,7 +420,7 @@ function DashboardList(props: DashboardListProps) { tabIndex={0} onClick={() => openDashboardEditModal(dashboard)} > - Edit + Edit )} diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index 018972357c478..bae6a5a2e664e 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -303,7 +303,7 @@ const DatasetList: FunctionComponent = ({ className="action-button" onClick={handleEdit} > - + )} From 606a61b3c9cb44f65bc2212688cf61510e41b881 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Fri, 11 Sep 2020 23:44:01 -0700 Subject: [PATCH 11/29] more pencil migrations --- .../cypress/integration/dashboard/edit_mode.test.js | 2 +- .../spec/javascripts/views/CRUD/chart/ChartList_spec.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/chart/ChartList_spec.jsx index 14366a444beea..a36364ab4b69d 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(); }); From 90033e23902fe4b811ebbabb4d2c046b1cf7c6b6 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Fri, 11 Sep 2020 23:44:21 -0700 Subject: [PATCH 12/29] easy list view rename --- superset-frontend/images/icons/{list-view.svg => list_view.svg} | 0 superset-frontend/src/components/Icon/index.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename superset-frontend/images/icons/{list-view.svg => list_view.svg} (100%) 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/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 385dba6725901..07caba11382a7 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -35,7 +35,7 @@ import { ReactComponent as DropdownArrowIcon } from 'images/icons/dropdown-arrow import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg'; import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg'; import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; -import { ReactComponent as ListViewIcon } from 'images/icons/list-view.svg'; +import { ReactComponent as ListViewIcon } from 'images/icons/list_view.svg'; import { ReactComponent as MoreIcon } from 'images/icons/more.svg'; import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; From 003b9a15c2a0f66a5060ea68d45921d2a95a44a9 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Fri, 11 Sep 2020 23:44:55 -0700 Subject: [PATCH 13/29] star -> favorite (changed in Figma) --- .../{star_small_selected.svg => favorite_small_selected.svg} | 0 superset-frontend/images/icons/star_selected.svg | 3 --- superset-frontend/images/icons/star_unselected.svg | 3 --- 3 files changed, 6 deletions(-) rename superset-frontend/images/icons/{star_small_selected.svg => favorite_small_selected.svg} (100%) delete mode 100644 superset-frontend/images/icons/star_selected.svg delete mode 100644 superset-frontend/images/icons/star_unselected.svg diff --git a/superset-frontend/images/icons/star_small_selected.svg b/superset-frontend/images/icons/favorite_small_selected.svg similarity index 100% rename from superset-frontend/images/icons/star_small_selected.svg rename to superset-frontend/images/icons/favorite_small_selected.svg diff --git a/superset-frontend/images/icons/star_selected.svg b/superset-frontend/images/icons/star_selected.svg deleted file mode 100644 index 9a02dc52e88e5..0000000000000 --- a/superset-frontend/images/icons/star_selected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/superset-frontend/images/icons/star_unselected.svg b/superset-frontend/images/icons/star_unselected.svg deleted file mode 100644 index 9208241b4a3ef..0000000000000 --- a/superset-frontend/images/icons/star_unselected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - From ea8a75b056bae34b538b2064db63da795e86044d Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 14 Sep 2020 15:28:51 -0700 Subject: [PATCH 14/29] removing deprecated icon --- superset-frontend/images/icons/sort_sorted.svg | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 superset-frontend/images/icons/sort_sorted.svg diff --git a/superset-frontend/images/icons/sort_sorted.svg b/superset-frontend/images/icons/sort_sorted.svg deleted file mode 100644 index 6639c00a83fee..0000000000000 --- a/superset-frontend/images/icons/sort_sorted.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 7b0d6d38cf45acfb5391d6798a06f646749b5081 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 14 Sep 2020 15:30:13 -0700 Subject: [PATCH 15/29] renaming icon to mach figma --- .../images/icons/{warning-solid.svg => warning_solid.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename superset-frontend/images/icons/{warning-solid.svg => warning_solid.svg} (100%) diff --git a/superset-frontend/images/icons/warning-solid.svg b/superset-frontend/images/icons/warning_solid.svg similarity index 100% rename from superset-frontend/images/icons/warning-solid.svg rename to superset-frontend/images/icons/warning_solid.svg From 3b2dce41d2e171482c498f9e385f4a2b3ef02a5b Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 14 Sep 2020 15:34:21 -0700 Subject: [PATCH 16/29] More -> More Horiz --- superset-frontend/images/icons/more.svg | 21 ------------------- superset-frontend/images/icons/more_horiz.svg | 20 +++++++++++++++++- .../src/components/Icon/index.tsx | 6 +++--- 3 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 superset-frontend/images/icons/more.svg diff --git a/superset-frontend/images/icons/more.svg b/superset-frontend/images/icons/more.svg deleted file mode 100644 index 5a66fe35c7925..0000000000000 --- a/superset-frontend/images/icons/more.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/superset-frontend/images/icons/more_horiz.svg b/superset-frontend/images/icons/more_horiz.svg index 37dfd3a4cee7a..5a66fe35c7925 100644 --- a/superset-frontend/images/icons/more_horiz.svg +++ b/superset-frontend/images/icons/more_horiz.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 07caba11382a7..b520f060acd2d 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -36,7 +36,7 @@ import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg'; import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg'; import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; import { ReactComponent as ListViewIcon } from 'images/icons/list_view.svg'; -import { ReactComponent as MoreIcon } from 'images/icons/more.svg'; +import { ReactComponent as MoreHorizIcon } from 'images/icons/more-horiz.svg'; import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; import { ReactComponent as ShareIcon } from 'images/icons/share.svg'; @@ -66,7 +66,7 @@ type IconName = | 'favorite-selected' | 'favorite-unselected' | 'list-view' - | 'more' + | 'more-horiz' | 'edit-alt' | 'search' | 'share' @@ -101,7 +101,7 @@ export const iconsRegistry: Record< close: CloseIcon, 'nav-explore': NavExploreIcon, 'error-solid': ErrorSolidIcon, - more: MoreIcon, + 'more-horiz': MoreHorizIcon, "edit-alt": EditAltIcon, search: SearchIcon, share: ShareIcon, From 9d2362f1e17b751aa5aab1981dc57408e11a3a1b Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 14 Sep 2020 15:55:41 -0700 Subject: [PATCH 17/29] forgot to change this when ranming the file --- superset-frontend/src/components/Icon/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index b520f060acd2d..a60e93a54267c 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -36,7 +36,7 @@ import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg'; import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg'; import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; import { ReactComponent as ListViewIcon } from 'images/icons/list_view.svg'; -import { ReactComponent as MoreHorizIcon } from 'images/icons/more-horiz.svg'; +import { ReactComponent as MoreHorizIcon } from 'images/icons/more_horiz.svg'; import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; import { ReactComponent as ShareIcon } from 'images/icons/share.svg'; From 8a8c44c0dd2254a857f9b76f6b0621ad5a4e8285 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 14 Sep 2020 17:25:17 -0700 Subject: [PATCH 18/29] updating some icon names in use --- .../src/components/ListViewCard/ListViewCard.stories.tsx | 2 +- superset-frontend/src/messageToasts/components/Toast.tsx | 2 +- superset-frontend/src/views/CRUD/chart/ChartList.tsx | 2 +- superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx | 2 +- superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx | 2 +- .../src/views/CRUD/data/dataset/AddDatasetModal.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx index 134ef589e5f4f..2af54957b0dac 100644 --- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx +++ b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx @@ -80,7 +80,7 @@ export const SupersetListViewCard = () => { } > - + } 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 1b1eca7f12044..9d1ee0885a9b3 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx @@ -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 8f68648c9551f..3f8561d8f6958 100644 --- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx +++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx @@ -454,7 +454,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/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')} } From 6c24a4cd4552c5947d378e8036c0cb869a0946a5 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 22 Sep 2020 00:06:39 -0700 Subject: [PATCH 19/29] adding hella icons --- superset-frontend/images/icons/alert.svg | 20 +- .../images/icons/alert_solid.svg | 20 +- superset-frontend/images/icons/binoculars.svg | 20 +- superset-frontend/images/icons/bolt.svg | 20 +- superset-frontend/images/icons/bolt_small.svg | 20 +- .../images/icons/bolt_small_run.svg | 20 +- superset-frontend/images/icons/calendar.svg | 20 +- superset-frontend/images/icons/cancel.svg | 20 +- .../images/icons/cancel_solid.svg | 20 +- superset-frontend/images/icons/cards.svg | 2 +- .../images/icons/cards_locked.svg | 22 +- superset-frontend/images/icons/caret_down.svg | 20 +- superset-frontend/images/icons/caret_left.svg | 20 +- .../images/icons/caret_right.svg | 20 +- superset-frontend/images/icons/caret_up.svg | 20 +- .../images/icons/checkbox-half.svg | 2 +- .../images/icons/checkbox-off.svg | 2 +- .../images/icons/checkbox-on.svg | 2 +- superset-frontend/images/icons/circle.svg | 20 +- superset-frontend/images/icons/clock.svg | 20 +- superset-frontend/images/icons/code.svg | 20 +- superset-frontend/images/icons/cog.svg | 22 +- superset-frontend/images/icons/collapse.svg | 20 +- .../images/icons/color_palette.svg | 20 +- superset-frontend/images/icons/components.svg | 22 +- superset-frontend/images/icons/copy.svg | 20 +- .../images/icons/cursor_target.svg | 20 +- superset-frontend/images/icons/database.svg | 2 +- .../images/icons/dataset_virtual.svg | 2 +- .../icons/dataset_virtual_greyscale.svg | 20 +- superset-frontend/images/icons/download.svg | 20 +- superset-frontend/images/icons/edit.svg | 20 +- superset-frontend/images/icons/email.svg | 20 +- superset-frontend/images/icons/error.svg | 20 +- .../images/icons/error_solid_small.svg | 20 +- superset-frontend/images/icons/expand.svg | 20 +- superset-frontend/images/icons/eye.svg | 20 +- superset-frontend/images/icons/eye_slash.svg | 20 +- .../images/icons/favorite_small_selected.svg | 18 ++ superset-frontend/images/icons/field_abc.svg | 20 +- .../images/icons/field_boolean.svg | 20 +- superset-frontend/images/icons/field_date.svg | 20 +- .../images/icons/field_derived.svg | 20 +- superset-frontend/images/icons/field_num.svg | 20 +- .../images/icons/field_struct.svg | 20 +- superset-frontend/images/icons/file.svg | 20 +- superset-frontend/images/icons/filter.svg | 20 +- superset-frontend/images/icons/folder.svg | 20 +- superset-frontend/images/icons/full.svg | 20 +- superset-frontend/images/icons/gear.svg | 20 +- superset-frontend/images/icons/grid.svg | 20 +- superset-frontend/images/icons/image.svg | 20 +- superset-frontend/images/icons/info-solid.svg | 20 +- superset-frontend/images/icons/info.svg | 20 +- .../images/icons/info_solid_small.svg | 20 +- superset-frontend/images/icons/join.svg | 20 +- superset-frontend/images/icons/keyboard.svg | 20 +- superset-frontend/images/icons/layers.svg | 20 +- superset-frontend/images/icons/lightbulb.svg | 20 +- superset-frontend/images/icons/list.svg | 20 +- superset-frontend/images/icons/location.svg | 20 +- .../images/icons/lock_locked.svg | 20 +- .../images/icons/lock_unlocked.svg | 20 +- superset-frontend/images/icons/map.svg | 20 +- superset-frontend/images/icons/message.svg | 20 +- superset-frontend/images/icons/minus.svg | 20 +- .../images/icons/minus_solid.svg | 20 +- superset-frontend/images/icons/move.svg | 20 +- superset-frontend/images/icons/nav_charts.svg | 22 +- .../images/icons/nav_dashboard.svg | 20 +- superset-frontend/images/icons/nav_data.svg | 20 +- superset-frontend/images/icons/nav_home.svg | 20 +- superset-frontend/images/icons/nav_lab.svg | 20 +- superset-frontend/images/icons/note.svg | 20 +- superset-frontend/images/icons/paperclip.svg | 20 +- .../images/icons/placeholder.svg | 20 +- superset-frontend/images/icons/plus.svg | 20 +- superset-frontend/images/icons/plus_large.svg | 20 +- superset-frontend/images/icons/plus_small.svg | 20 +- superset-frontend/images/icons/plus_solid.svg | 20 +- superset-frontend/images/icons/refresh.svg | 20 +- superset-frontend/images/icons/server.svg | 20 +- superset-frontend/images/icons/sql.svg | 22 +- superset-frontend/images/icons/table.svg | 22 +- superset-frontend/images/icons/tag.svg | 20 +- .../images/icons/triangle_change.svg | 20 +- .../images/icons/triangle_down.svg | 20 +- .../images/icons/triangle_up.svg | 20 +- superset-frontend/images/icons/up-level.svg | 20 +- superset-frontend/images/icons/user.svg | 20 +- superset-frontend/images/icons/warning.svg | 20 +- superset-frontend/images/icons/x-large.svg | 20 +- superset-frontend/images/icons/x-small.svg | 20 +- .../src/components/Icon/index.tsx | 297 +++++++++++++++++- 94 files changed, 1945 insertions(+), 114 deletions(-) diff --git a/superset-frontend/images/icons/alert.svg b/superset-frontend/images/icons/alert.svg index bb6910f112d34..71638ce70fba3 100644 --- a/superset-frontend/images/icons/alert.svg +++ b/superset-frontend/images/icons/alert.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/alert_solid.svg b/superset-frontend/images/icons/alert_solid.svg index 2da21967b55db..a7f1551c3f845 100644 --- a/superset-frontend/images/icons/alert_solid.svg +++ b/superset-frontend/images/icons/alert_solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/binoculars.svg b/superset-frontend/images/icons/binoculars.svg index 6919bca11717d..abef243921148 100644 --- a/superset-frontend/images/icons/binoculars.svg +++ b/superset-frontend/images/icons/binoculars.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/bolt.svg b/superset-frontend/images/icons/bolt.svg index 6b8741e976574..be1d7133ab0ea 100644 --- a/superset-frontend/images/icons/bolt.svg +++ b/superset-frontend/images/icons/bolt.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/bolt_small.svg b/superset-frontend/images/icons/bolt_small.svg index a98f0751d69a2..0f56c10267c18 100644 --- a/superset-frontend/images/icons/bolt_small.svg +++ b/superset-frontend/images/icons/bolt_small.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/bolt_small_run.svg b/superset-frontend/images/icons/bolt_small_run.svg index df5dd4715d465..3690ab1c72f88 100644 --- a/superset-frontend/images/icons/bolt_small_run.svg +++ b/superset-frontend/images/icons/bolt_small_run.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/calendar.svg b/superset-frontend/images/icons/calendar.svg index 295be7156aa2c..3b39c1da8072f 100644 --- a/superset-frontend/images/icons/calendar.svg +++ b/superset-frontend/images/icons/calendar.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/cancel.svg b/superset-frontend/images/icons/cancel.svg index a149df199595f..561503bcbf04f 100644 --- a/superset-frontend/images/icons/cancel.svg +++ b/superset-frontend/images/icons/cancel.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/cancel_solid.svg b/superset-frontend/images/icons/cancel_solid.svg index 791ef6ef9ca47..c0f03e6f189cd 100644 --- a/superset-frontend/images/icons/cancel_solid.svg +++ b/superset-frontend/images/icons/cancel_solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/cards.svg b/superset-frontend/images/icons/cards.svg index 7445aa209efa3..fd6db8de23b54 100644 --- a/superset-frontend/images/icons/cards.svg +++ b/superset-frontend/images/icons/cards.svg @@ -1,3 +1,3 @@ - + diff --git a/superset-frontend/images/icons/cards_locked.svg b/superset-frontend/images/icons/cards_locked.svg index d09ad0faa3869..522ddf986890c 100644 --- a/superset-frontend/images/icons/cards_locked.svg +++ b/superset-frontend/images/icons/cards_locked.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/caret_down.svg b/superset-frontend/images/icons/caret_down.svg index 29ce19efa80b9..0ffc7e5cf1eb0 100644 --- a/superset-frontend/images/icons/caret_down.svg +++ b/superset-frontend/images/icons/caret_down.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/caret_left.svg b/superset-frontend/images/icons/caret_left.svg index cdea2bfeadd31..d43471dcc5192 100644 --- a/superset-frontend/images/icons/caret_left.svg +++ b/superset-frontend/images/icons/caret_left.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/caret_right.svg b/superset-frontend/images/icons/caret_right.svg index aafc5bd85682c..4ab4545c6dd6a 100644 --- a/superset-frontend/images/icons/caret_right.svg +++ b/superset-frontend/images/icons/caret_right.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/caret_up.svg b/superset-frontend/images/icons/caret_up.svg index fc8002c5f7291..c854683c071d6 100644 --- a/superset-frontend/images/icons/caret_up.svg +++ b/superset-frontend/images/icons/caret_up.svg @@ -1,3 +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 index 526e51015c52b..bc2bcd40977b4 100644 --- a/superset-frontend/images/icons/circle.svg +++ b/superset-frontend/images/icons/circle.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/clock.svg b/superset-frontend/images/icons/clock.svg index ab2bfa4b5e6c2..f6597972091a1 100644 --- a/superset-frontend/images/icons/clock.svg +++ b/superset-frontend/images/icons/clock.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/code.svg b/superset-frontend/images/icons/code.svg index d23945b82421f..ae413cc881188 100644 --- a/superset-frontend/images/icons/code.svg +++ b/superset-frontend/images/icons/code.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/cog.svg b/superset-frontend/images/icons/cog.svg index 7e00158d4675a..0b5f64bde9d65 100644 --- a/superset-frontend/images/icons/cog.svg +++ b/superset-frontend/images/icons/cog.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/collapse.svg b/superset-frontend/images/icons/collapse.svg index 9548389dbccc0..7282252a256cf 100644 --- a/superset-frontend/images/icons/collapse.svg +++ b/superset-frontend/images/icons/collapse.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/color_palette.svg b/superset-frontend/images/icons/color_palette.svg index da5d11739b7b0..3fc0413268c40 100644 --- a/superset-frontend/images/icons/color_palette.svg +++ b/superset-frontend/images/icons/color_palette.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/components.svg b/superset-frontend/images/icons/components.svg index 7102eff8812d1..46f67e4514826 100644 --- a/superset-frontend/images/icons/components.svg +++ b/superset-frontend/images/icons/components.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/copy.svg b/superset-frontend/images/icons/copy.svg index 7876679307134..b6c569d0b40cc 100644 --- a/superset-frontend/images/icons/copy.svg +++ b/superset-frontend/images/icons/copy.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/cursor_target.svg b/superset-frontend/images/icons/cursor_target.svg index 77219655a2f5d..99a81817de0b1 100644 --- a/superset-frontend/images/icons/cursor_target.svg +++ b/superset-frontend/images/icons/cursor_target.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/database.svg b/superset-frontend/images/icons/database.svg index 3464e04d7a6ea..bb8c9a99937b9 100644 --- a/superset-frontend/images/icons/database.svg +++ b/superset-frontend/images/icons/database.svg @@ -17,5 +17,5 @@ under the License. --> - + diff --git a/superset-frontend/images/icons/dataset_virtual.svg b/superset-frontend/images/icons/dataset_virtual.svg index ca15dcb63d5e9..fe0573aced2ca 100644 --- a/superset-frontend/images/icons/dataset_virtual.svg +++ b/superset-frontend/images/icons/dataset_virtual.svg @@ -18,5 +18,5 @@ --> - + diff --git a/superset-frontend/images/icons/dataset_virtual_greyscale.svg b/superset-frontend/images/icons/dataset_virtual_greyscale.svg index cce832a30467b..927ee8462d263 100644 --- a/superset-frontend/images/icons/dataset_virtual_greyscale.svg +++ b/superset-frontend/images/icons/dataset_virtual_greyscale.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/download.svg b/superset-frontend/images/icons/download.svg index 70770e182e337..732fe39bb71e9 100644 --- a/superset-frontend/images/icons/download.svg +++ b/superset-frontend/images/icons/download.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/edit.svg b/superset-frontend/images/icons/edit.svg index 395a5b6b3c513..a732b45373e06 100644 --- a/superset-frontend/images/icons/edit.svg +++ b/superset-frontend/images/icons/edit.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/email.svg b/superset-frontend/images/icons/email.svg index 398596c35cd73..5eb707833dae6 100644 --- a/superset-frontend/images/icons/email.svg +++ b/superset-frontend/images/icons/email.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/error.svg b/superset-frontend/images/icons/error.svg index fe93c9ccdf91a..0cb50fddcf290 100644 --- a/superset-frontend/images/icons/error.svg +++ b/superset-frontend/images/icons/error.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/error_solid_small.svg b/superset-frontend/images/icons/error_solid_small.svg index 12b0dfe5a1064..c28efde2eb7de 100644 --- a/superset-frontend/images/icons/error_solid_small.svg +++ b/superset-frontend/images/icons/error_solid_small.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/expand.svg b/superset-frontend/images/icons/expand.svg index 0cd5ff40436ba..02a26916c59c1 100644 --- a/superset-frontend/images/icons/expand.svg +++ b/superset-frontend/images/icons/expand.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/eye.svg b/superset-frontend/images/icons/eye.svg index 7bac79ca5b6a6..262d9bb6d9070 100644 --- a/superset-frontend/images/icons/eye.svg +++ b/superset-frontend/images/icons/eye.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/eye_slash.svg b/superset-frontend/images/icons/eye_slash.svg index 86a9d0c8671df..fad4969a45f88 100644 --- a/superset-frontend/images/icons/eye_slash.svg +++ b/superset-frontend/images/icons/eye_slash.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/favorite_small_selected.svg b/superset-frontend/images/icons/favorite_small_selected.svg index b6ffef6116363..9ce5802aecf67 100644 --- a/superset-frontend/images/icons/favorite_small_selected.svg +++ b/superset-frontend/images/icons/favorite_small_selected.svg @@ -1,3 +1,21 @@ + diff --git a/superset-frontend/images/icons/field_abc.svg b/superset-frontend/images/icons/field_abc.svg index 9aee57c43b798..ce519516c8803 100644 --- a/superset-frontend/images/icons/field_abc.svg +++ b/superset-frontend/images/icons/field_abc.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/field_boolean.svg b/superset-frontend/images/icons/field_boolean.svg index 87c9161c09926..a804e7d9faa5a 100644 --- a/superset-frontend/images/icons/field_boolean.svg +++ b/superset-frontend/images/icons/field_boolean.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/field_date.svg b/superset-frontend/images/icons/field_date.svg index 9d4fb76221fec..cf796fab70b9b 100644 --- a/superset-frontend/images/icons/field_date.svg +++ b/superset-frontend/images/icons/field_date.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/field_derived.svg b/superset-frontend/images/icons/field_derived.svg index ea0cddb5cd8be..00e2115bf4863 100644 --- a/superset-frontend/images/icons/field_derived.svg +++ b/superset-frontend/images/icons/field_derived.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/field_num.svg b/superset-frontend/images/icons/field_num.svg index d1f41283fb487..69b6aa2e337ed 100644 --- a/superset-frontend/images/icons/field_num.svg +++ b/superset-frontend/images/icons/field_num.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/field_struct.svg b/superset-frontend/images/icons/field_struct.svg index 2944d950ac71c..8877592f56553 100644 --- a/superset-frontend/images/icons/field_struct.svg +++ b/superset-frontend/images/icons/field_struct.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/file.svg b/superset-frontend/images/icons/file.svg index 9a3a3e4a16d92..5484d710ba458 100644 --- a/superset-frontend/images/icons/file.svg +++ b/superset-frontend/images/icons/file.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/filter.svg b/superset-frontend/images/icons/filter.svg index 5b26f41d3c835..f762e26de0eaa 100644 --- a/superset-frontend/images/icons/filter.svg +++ b/superset-frontend/images/icons/filter.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/folder.svg b/superset-frontend/images/icons/folder.svg index a32fed314c688..969153876efe7 100644 --- a/superset-frontend/images/icons/folder.svg +++ b/superset-frontend/images/icons/folder.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/full.svg b/superset-frontend/images/icons/full.svg index 474e96d5a9e55..b194f4c7b2bf1 100644 --- a/superset-frontend/images/icons/full.svg +++ b/superset-frontend/images/icons/full.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/gear.svg b/superset-frontend/images/icons/gear.svg index dbff781108e8e..f76f97f473a31 100644 --- a/superset-frontend/images/icons/gear.svg +++ b/superset-frontend/images/icons/gear.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/grid.svg b/superset-frontend/images/icons/grid.svg index 071a91c445a71..b128c3fe50404 100644 --- a/superset-frontend/images/icons/grid.svg +++ b/superset-frontend/images/icons/grid.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/image.svg b/superset-frontend/images/icons/image.svg index f5173ed9b7d83..dd06cb303c7a5 100644 --- a/superset-frontend/images/icons/image.svg +++ b/superset-frontend/images/icons/image.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/info-solid.svg b/superset-frontend/images/icons/info-solid.svg index 7d9e45acc2703..2ac0b766822a1 100644 --- a/superset-frontend/images/icons/info-solid.svg +++ b/superset-frontend/images/icons/info-solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/info.svg b/superset-frontend/images/icons/info.svg index 587243f30b97c..6d1820568fb78 100644 --- a/superset-frontend/images/icons/info.svg +++ b/superset-frontend/images/icons/info.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/info_solid_small.svg b/superset-frontend/images/icons/info_solid_small.svg index 93eed597636e0..ea18a0b3812be 100644 --- a/superset-frontend/images/icons/info_solid_small.svg +++ b/superset-frontend/images/icons/info_solid_small.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/join.svg b/superset-frontend/images/icons/join.svg index e1b48c694051e..c1b2d9cf4b932 100644 --- a/superset-frontend/images/icons/join.svg +++ b/superset-frontend/images/icons/join.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/keyboard.svg b/superset-frontend/images/icons/keyboard.svg index c6191e864445b..7b7801242e44d 100644 --- a/superset-frontend/images/icons/keyboard.svg +++ b/superset-frontend/images/icons/keyboard.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/layers.svg b/superset-frontend/images/icons/layers.svg index ff4b6f911792c..6e23b437ed4ac 100644 --- a/superset-frontend/images/icons/layers.svg +++ b/superset-frontend/images/icons/layers.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/lightbulb.svg b/superset-frontend/images/icons/lightbulb.svg index 7458dd526623a..8df86d487179a 100644 --- a/superset-frontend/images/icons/lightbulb.svg +++ b/superset-frontend/images/icons/lightbulb.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/list.svg b/superset-frontend/images/icons/list.svg index c84c83f25f021..c31be33c67084 100644 --- a/superset-frontend/images/icons/list.svg +++ b/superset-frontend/images/icons/list.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/location.svg b/superset-frontend/images/icons/location.svg index 01b26fdf446b2..830ad90053d2b 100644 --- a/superset-frontend/images/icons/location.svg +++ b/superset-frontend/images/icons/location.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/lock_locked.svg b/superset-frontend/images/icons/lock_locked.svg index d27abf6f90d40..192974687b132 100644 --- a/superset-frontend/images/icons/lock_locked.svg +++ b/superset-frontend/images/icons/lock_locked.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/lock_unlocked.svg b/superset-frontend/images/icons/lock_unlocked.svg index 70db6a1784452..f7768d89c87f0 100644 --- a/superset-frontend/images/icons/lock_unlocked.svg +++ b/superset-frontend/images/icons/lock_unlocked.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/map.svg b/superset-frontend/images/icons/map.svg index 5185bb8f5b93c..c8bcf692f578f 100644 --- a/superset-frontend/images/icons/map.svg +++ b/superset-frontend/images/icons/map.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/message.svg b/superset-frontend/images/icons/message.svg index 8ac9422da237f..57ac4a6b74308 100644 --- a/superset-frontend/images/icons/message.svg +++ b/superset-frontend/images/icons/message.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/minus.svg b/superset-frontend/images/icons/minus.svg index f013c75a511bf..22e0744034859 100644 --- a/superset-frontend/images/icons/minus.svg +++ b/superset-frontend/images/icons/minus.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/minus_solid.svg b/superset-frontend/images/icons/minus_solid.svg index 170cb788fdca0..f34bb7127d9b8 100644 --- a/superset-frontend/images/icons/minus_solid.svg +++ b/superset-frontend/images/icons/minus_solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/move.svg b/superset-frontend/images/icons/move.svg index d7eecf5507fed..bec9182e64523 100644 --- a/superset-frontend/images/icons/move.svg +++ b/superset-frontend/images/icons/move.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/nav_charts.svg b/superset-frontend/images/icons/nav_charts.svg index 57bd1137555da..e4faf06745b35 100644 --- a/superset-frontend/images/icons/nav_charts.svg +++ b/superset-frontend/images/icons/nav_charts.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/nav_dashboard.svg b/superset-frontend/images/icons/nav_dashboard.svg index 6ae744ae2ee86..b14b337114f78 100644 --- a/superset-frontend/images/icons/nav_dashboard.svg +++ b/superset-frontend/images/icons/nav_dashboard.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/nav_data.svg b/superset-frontend/images/icons/nav_data.svg index d84f0daac27be..96fe26eeb313c 100644 --- a/superset-frontend/images/icons/nav_data.svg +++ b/superset-frontend/images/icons/nav_data.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/nav_home.svg b/superset-frontend/images/icons/nav_home.svg index ba456b4ce2aef..2c02850d1fa8b 100644 --- a/superset-frontend/images/icons/nav_home.svg +++ b/superset-frontend/images/icons/nav_home.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/nav_lab.svg b/superset-frontend/images/icons/nav_lab.svg index b35616e7beb4b..340d4d9e52f95 100644 --- a/superset-frontend/images/icons/nav_lab.svg +++ b/superset-frontend/images/icons/nav_lab.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/note.svg b/superset-frontend/images/icons/note.svg index 1dd8eb84c0321..01819bbbb9d4a 100644 --- a/superset-frontend/images/icons/note.svg +++ b/superset-frontend/images/icons/note.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/paperclip.svg b/superset-frontend/images/icons/paperclip.svg index fbec2153d4d35..c3df450333d26 100644 --- a/superset-frontend/images/icons/paperclip.svg +++ b/superset-frontend/images/icons/paperclip.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/placeholder.svg b/superset-frontend/images/icons/placeholder.svg index eaef71538904e..bf1ed56064ad5 100644 --- a/superset-frontend/images/icons/placeholder.svg +++ b/superset-frontend/images/icons/placeholder.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/plus.svg b/superset-frontend/images/icons/plus.svg index 0a83a9c50909a..539379e884d44 100644 --- a/superset-frontend/images/icons/plus.svg +++ b/superset-frontend/images/icons/plus.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/plus_large.svg b/superset-frontend/images/icons/plus_large.svg index d1f7821997a4c..4ffdb6912b3bd 100644 --- a/superset-frontend/images/icons/plus_large.svg +++ b/superset-frontend/images/icons/plus_large.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/plus_small.svg b/superset-frontend/images/icons/plus_small.svg index 415b30490e0ba..efe61a5082dd5 100644 --- a/superset-frontend/images/icons/plus_small.svg +++ b/superset-frontend/images/icons/plus_small.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/plus_solid.svg b/superset-frontend/images/icons/plus_solid.svg index ab1dad4125670..3601cdf8b7704 100644 --- a/superset-frontend/images/icons/plus_solid.svg +++ b/superset-frontend/images/icons/plus_solid.svg @@ -1,4 +1,22 @@ + - + diff --git a/superset-frontend/images/icons/refresh.svg b/superset-frontend/images/icons/refresh.svg index 377bd40ca5290..6e5fc9eab6976 100644 --- a/superset-frontend/images/icons/refresh.svg +++ b/superset-frontend/images/icons/refresh.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/server.svg b/superset-frontend/images/icons/server.svg index 866c706eec384..f7842a8298d43 100644 --- a/superset-frontend/images/icons/server.svg +++ b/superset-frontend/images/icons/server.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/sql.svg b/superset-frontend/images/icons/sql.svg index 96ebf96150bbb..a15a5cb2542d1 100644 --- a/superset-frontend/images/icons/sql.svg +++ b/superset-frontend/images/icons/sql.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/table.svg b/superset-frontend/images/icons/table.svg index 1aa5f36c6fb40..fca912377e412 100644 --- a/superset-frontend/images/icons/table.svg +++ b/superset-frontend/images/icons/table.svg @@ -1,4 +1,22 @@ + - - + + diff --git a/superset-frontend/images/icons/tag.svg b/superset-frontend/images/icons/tag.svg index c653a20c86ef3..2abb55d326ce9 100644 --- a/superset-frontend/images/icons/tag.svg +++ b/superset-frontend/images/icons/tag.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/triangle_change.svg b/superset-frontend/images/icons/triangle_change.svg index b417ef1662d36..f06c145618b59 100644 --- a/superset-frontend/images/icons/triangle_change.svg +++ b/superset-frontend/images/icons/triangle_change.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/triangle_down.svg b/superset-frontend/images/icons/triangle_down.svg index cbed28f213eb2..24bcdf2c66740 100644 --- a/superset-frontend/images/icons/triangle_down.svg +++ b/superset-frontend/images/icons/triangle_down.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/triangle_up.svg b/superset-frontend/images/icons/triangle_up.svg index 716e515a4e7c6..e8cfa2476f5de 100644 --- a/superset-frontend/images/icons/triangle_up.svg +++ b/superset-frontend/images/icons/triangle_up.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/up-level.svg b/superset-frontend/images/icons/up-level.svg index cc90052b74e11..29e2eaafb69d0 100644 --- a/superset-frontend/images/icons/up-level.svg +++ b/superset-frontend/images/icons/up-level.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/user.svg b/superset-frontend/images/icons/user.svg index f4c5fb33af5d1..774c9be767d5f 100644 --- a/superset-frontend/images/icons/user.svg +++ b/superset-frontend/images/icons/user.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/warning.svg b/superset-frontend/images/icons/warning.svg index 709fff83564e0..cfe3b089a9934 100644 --- a/superset-frontend/images/icons/warning.svg +++ b/superset-frontend/images/icons/warning.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/x-large.svg b/superset-frontend/images/icons/x-large.svg index b8a1c113539e4..d96e5e02de6bb 100644 --- a/superset-frontend/images/icons/x-large.svg +++ b/superset-frontend/images/icons/x-large.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/images/icons/x-small.svg b/superset-frontend/images/icons/x-small.svg index 9623f542040db..6d2fb53b7e368 100644 --- a/superset-frontend/images/icons/x-small.svg +++ b/superset-frontend/images/icons/x-small.svg @@ -1,3 +1,21 @@ + - + diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index a60e93a54267c..162ff76b6d16e 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -17,38 +17,142 @@ * under the License. */ import React, { SVGProps } from 'react'; + +import { ReactComponent as AlertSolidIcon } from 'images/icons/alert_solid.svg'; +import { ReactComponent as AlertIcon } from 'images/icons/alert.svg'; +import { ReactComponent as BinocularsIcon } from 'images/icons/binoculars.svg'; +import { ReactComponent as BoltSmallRunIcon } from 'images/icons/bolt_small_run.svg'; +import { ReactComponent as BoltSmallIcon } from 'images/icons/bolt_small.svg'; +import { ReactComponent as BoltIcon } from 'images/icons/bolt.svg'; +import { ReactComponent as CalendarIcon } from 'images/icons/calendar.svg'; +import { ReactComponent as CancelSolidIcon } from 'images/icons/cancel_solid.svg'; import { ReactComponent as CancelXIcon } from 'images/icons/cancel-x.svg'; +import { ReactComponent as CancelIcon } from 'images/icons/cancel.svg'; import { ReactComponent as CardViewIcon } from 'images/icons/card_view.svg'; +import { ReactComponent as CardsLockedIcon } from 'images/icons/cards_locked.svg'; +import { ReactComponent as CardsIcon } from 'images/icons/cards.svg'; +import { ReactComponent as CaretDownIcon } from 'images/icons/caret_down.svg'; +import { ReactComponent as CaretLeftIcon } from 'images/icons/caret_left.svg'; +import { ReactComponent as CaretRightIcon } from 'images/icons/caret_right.svg'; +import { ReactComponent as CaretUpIcon } from 'images/icons/caret_up.svg'; import { ReactComponent as CertifiedIcon } from 'images/icons/certified.svg'; +import { ReactComponent as CheckIcon } from 'images/icons/check.svg'; import { ReactComponent as CheckboxHalfIcon } from 'images/icons/checkbox-half.svg'; import { ReactComponent as CheckboxOffIcon } from 'images/icons/checkbox-off.svg'; import { ReactComponent as CheckboxOnIcon } from 'images/icons/checkbox-on.svg'; -import { ReactComponent as CheckIcon } from 'images/icons/check.svg'; -import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg'; import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg'; +import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg'; +import { ReactComponent as CircleIcon } from 'images/icons/circle.svg'; +import { ReactComponent as ClockIcon } from 'images/icons/clock.svg'; import { ReactComponent as CloseIcon } from 'images/icons/close.svg'; -import { ReactComponent as NavExploreIcon } from 'images/icons/nav_explore.svg'; +import { ReactComponent as CodeIcon } from 'images/icons/code.svg'; +import { ReactComponent as CogIcon } from 'images/icons/cog.svg'; +import { ReactComponent as CollapseIcon } from 'images/icons/collapse.svg'; +import { ReactComponent as ColorPaletteIcon } from 'images/icons/color_palette.svg'; +import { ReactComponent as ComponentsIcon } from 'images/icons/components.svg'; +import { ReactComponent as CopyIcon } from 'images/icons/copy.svg'; +import { ReactComponent as CursorTargeIcon } from 'images/icons/cursor_target.svg'; import { ReactComponent as DatabaseIcon } from 'images/icons/database.svg'; import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_physical.svg'; +import { ReactComponent as DatasetVirtualGreyscaleIcon } from 'images/icons/dataset_virtual_greyscale.svg'; import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg'; +import { ReactComponent as DownloadIcon } from 'images/icons/download.svg'; import { ReactComponent as DropdownArrowIcon } from 'images/icons/dropdown-arrow.svg'; +import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; +import { ReactComponent as EditIcon } from 'images/icons/edit.svg'; +import { ReactComponent as EmailIcon } from 'images/icons/email.svg'; +import { ReactComponent as ErrorSolidSmallIcon } from 'images/icons/error_solid_small.svg'; import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg'; +import { ReactComponent as ErrorIcon } from 'images/icons/error.svg'; +import { ReactComponent as ExpandIcon } from 'images/icons/expand.svg'; +import { ReactComponent as EyeSlashIcon } from 'images/icons/eye_slash.svg'; +import { ReactComponent as EyeIcon } from 'images/icons/eye.svg'; +import { ReactComponent as FavoriteSmallSelectedIcon } from 'images/icons/favorite_small_selected.svg'; import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg'; import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg'; +import { ReactComponent as FieldABCIcon } from 'images/icons/field_abc.svg'; +import { ReactComponent as FieldBooleanIcon } from 'images/icons/field_boolean.svg'; +import { ReactComponent as FieldDateIcon } from 'images/icons/field_date.svg'; +import { ReactComponent as FieldDerivedIcon } from 'images/icons/field_derived.svg'; +import { ReactComponent as FieldNumIcon } from 'images/icons/field_num.svg'; +import { ReactComponent as FieldStructIcon } from 'images/icons/field_struct.svg'; +import { ReactComponent as FileIcon } from 'images/icons/file.svg'; +import { ReactComponent as FilterIcon } from 'images/icons/filter.svg'; +import { ReactComponent as FolderIcon } from 'images/icons/folder.svg'; +import { ReactComponent as FullIcon } from 'images/icons/full.svg'; +import { ReactComponent as GearIcon } from 'images/icons/gear.svg'; +import { ReactComponent as GridIcon } from 'images/icons/grid.svg'; +import { ReactComponent as ImageIcon } from 'images/icons/image.svg'; +import { ReactComponent as InfoSolidSmallIcon } from 'images/icons/info_solid_small.svg'; +import { ReactComponent as InfoSolidIcon } from 'images/icons/info-solid.svg'; +import { ReactComponent as InfoIcon } from 'images/icons/info.svg'; +import { ReactComponent as JoinIcon } from 'images/icons/join.svg'; +import { ReactComponent as KeyboardIcon } from 'images/icons/keyboard.svg'; +import { ReactComponent as LayersIcon } from 'images/icons/layers.svg'; +import { ReactComponent as LightbulbIcon } from 'images/icons/lightbulb.svg'; import { ReactComponent as ListViewIcon } from 'images/icons/list_view.svg'; +import { ReactComponent as ListIcon } from 'images/icons/list.svg'; +import { ReactComponent as LocationIcon } from 'images/icons/location.svg'; +import { ReactComponent as LockLockedIcon } from 'images/icons/lock_locked.svg'; +import { ReactComponent as LockUnlockedIcon } from 'images/icons/lock_unlocked.svg'; +import { ReactComponent as MapIcon } from 'images/icons/map.svg'; +import { ReactComponent as MessageIcon } from 'images/icons/message.svg'; +import { ReactComponent as MinusSolidIcon } from 'images/icons/minus_solid.svg'; +import { ReactComponent as MinusIcon } from 'images/icons/minus.svg'; import { ReactComponent as MoreHorizIcon } from 'images/icons/more_horiz.svg'; -import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; +import { ReactComponent as MoveIcon } from 'images/icons/move.svg'; +import { ReactComponent as NavChartsIcon } from 'images/icons/nav_charts.svg'; +import { ReactComponent as NavDashboardIcon } from 'images/icons/nav_dashboard.svg'; +import { ReactComponent as NavDataIcon } from 'images/icons/nav_data.svg'; +import { ReactComponent as NavExploreIcon } from 'images/icons/nav_explore.svg'; +import { ReactComponent as NavHomeIcon } from 'images/icons/nav_home.svg'; +import { ReactComponent as NavLabIcon } from 'images/icons/nav_lab.svg'; +import { ReactComponent as NoteIcon } from 'images/icons/note.svg'; +import { ReactComponent as PaperclipIcon } from 'images/icons/paperclip.svg'; +import { ReactComponent as PlaceholderIcon } from 'images/icons/placeholder.svg'; +import { ReactComponent as PlusLargeIcon } from 'images/icons/plus_large.svg'; +import { ReactComponent as PlusSmallIcon } from 'images/icons/plus_small.svg'; +import { ReactComponent as PlusSolidIcon } from 'images/icons/plus_solid.svg'; +import { ReactComponent as PlusIcon } from 'images/icons/plus.svg'; +import { ReactComponent as RefreshIcon } from 'images/icons/refresh.svg'; import { ReactComponent as SearchIcon } from 'images/icons/search.svg'; +import { ReactComponent as ServerIcon } from 'images/icons/server.svg'; import { ReactComponent as ShareIcon } from 'images/icons/share.svg'; import { ReactComponent as SortAscIcon } from 'images/icons/sort_asc.svg'; import { ReactComponent as SortDescIcon } from 'images/icons/sort_desc.svg'; import { ReactComponent as SortIcon } from 'images/icons/sort.svg'; +import { ReactComponent as SQLIcon } from 'images/icons/sql.svg'; +import { ReactComponent as TableIcon } from 'images/icons/table.svg'; +import { ReactComponent as TagIcon } from 'images/icons/tag.svg'; import { ReactComponent as TrashIcon } from 'images/icons/trash.svg'; +import { ReactComponent as TriangleChangeIcon } from 'images/icons/triangle_change.svg'; +import { ReactComponent as TriangleDownIcon } from 'images/icons/triangle_down.svg'; +import { ReactComponent as TriangleUpIcon } from 'images/icons/triangle_up.svg'; +import { ReactComponent as UpLevelIcon } from 'images/icons/up-level.svg'; +import { ReactComponent as UserIcon } from 'images/icons/user.svg'; import { ReactComponent as WarningSolidIcon } from 'images/icons/warning_solid.svg'; +import { ReactComponent as WarningIcon } from 'images/icons/warning.svg'; +import { ReactComponent as XLargeIcon } from 'images/icons/x-large.svg'; +import { ReactComponent as XSmallIcon } from 'images/icons/x-small.svg'; type IconName = + | 'alert-solid' + | 'alert' + | 'binoculars' + | 'bolt-small-run' + | 'bolt-small' + | 'bolt' + | 'calendar' + | 'cancel-solid' | 'cancel-x' + | 'cancel' | 'card-view' + | 'cards-locked' + | 'cards' + | 'caret-down' + | 'caret-left' + | 'caret-right' + | 'caret-up' | 'certified' | 'check' | 'checkbox-half' @@ -56,58 +160,219 @@ type IconName = | 'checkbox-on' | 'circle-check-solid' | 'circle-check' + | 'circle' + | 'clock' | 'close' - | 'nav-explore' + | 'code' + | 'cog' + | 'collapse' + | 'color-palette' + | 'components' + | 'copy' + | 'cursor-target' | 'database' | 'dataset-physical' + | 'dataset-virtual-greyscale' | 'dataset-virtual' + | 'download' | 'dropdown-arrow' + | 'edit-alt' + | 'edit' + | 'email' + | 'error-solid-small' | 'error-solid' + | 'error' + | 'expand' + | 'eye-slash' + | 'eye' + | 'favorite-small-selected' | 'favorite-selected' | 'favorite-unselected' + | 'field-abc' + | 'field-boolean' + | 'field-date' + | 'field-derived' + | 'field-num' + | 'field-struct' + | 'file' + | 'filter' + | 'folder' + | 'full' + | 'gear' + | 'grid' + | 'image' + | 'info-solid-small' + | 'info-solid' + | 'info' + | 'join' + | 'keyboard' + | 'layers' + | 'lightbulb' | 'list-view' + | 'list' + | 'location' + | 'lock-locked' + | 'lock-unlocked' + | 'map' + | 'message' + | 'minus-solid' + | 'minus' | 'more-horiz' - | 'edit-alt' + | 'move' + | 'nav-charts' + | 'nav-dashboard' + | 'nav-data' + | 'nav-explore' + | 'nav-home' + | 'nav-lab' + | 'note' + | 'paperclip' + | 'placeholder' + | 'plus-large' + | 'plus-small' + | 'plus-solid' + | 'plus' + | 'refresh' | 'search' + | 'server' | 'share' | 'sort-asc' | 'sort-desc' | 'sort' + | 'sql' + | 'table' + | 'tag' | 'trash' - | 'warning-solid'; + | 'triangle-change' + | 'triangle-down' + | 'triangle-up' + | 'up-level' + | 'user' + | 'warning-solid' + | 'warning' + | 'x-large' + | 'x-small' export const iconsRegistry: Record< IconName, React.ComponentType> > = { + '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, + '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 , + 'dropdown-arrow': DropdownArrowIcon, + "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, - 'nav-explore': NavExploreIcon, - 'error-solid': ErrorSolidIcon, + 'list': ListIcon , + 'location': LocationIcon , + 'lock-locked': LockLockedIcon , + 'lock-unlocked': LockUnlockedIcon , + 'map': MapIcon , + 'message': MessageIcon , + 'minus-solid': MinusSolidIcon , + 'minus': MinusIcon , 'more-horiz': MoreHorizIcon, - "edit-alt": EditAltIcon, + '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': PlusSmallIcon , + '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 { From 48763b96a896b74e8637e3e438b9720ece5aee15 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 22 Sep 2020 17:29:45 -0700 Subject: [PATCH 20/29] fixing errant viewboxes --- superset-frontend/images/icons/favorite-selected.svg | 4 ++-- superset-frontend/images/icons/favorite-unselected.svg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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. --> - - + + From 60628935ff3b5622d2c644a0175e3dda4af94e0b Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 22 Sep 2020 17:41:41 -0700 Subject: [PATCH 21/29] removing dropdown-arrow in favor of triangle-down --- .../images/icons/dropdown-arrow.svg | 21 ------------------- .../src/components/Icon/index.tsx | 3 --- .../src/components/NavDropdown/index.tsx | 8 +++---- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 superset-frontend/images/icons/dropdown-arrow.svg 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/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 162ff76b6d16e..1f47bfd2cbdea 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -57,7 +57,6 @@ import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_phys import { ReactComponent as DatasetVirtualGreyscaleIcon } from 'images/icons/dataset_virtual_greyscale.svg'; import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg'; import { ReactComponent as DownloadIcon } from 'images/icons/download.svg'; -import { ReactComponent as DropdownArrowIcon } from 'images/icons/dropdown-arrow.svg'; import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg'; import { ReactComponent as EditIcon } from 'images/icons/edit.svg'; import { ReactComponent as EmailIcon } from 'images/icons/email.svg'; @@ -175,7 +174,6 @@ type IconName = | 'dataset-virtual-greyscale' | 'dataset-virtual' | 'download' - | 'dropdown-arrow' | 'edit-alt' | 'edit' | 'email' @@ -296,7 +294,6 @@ export const iconsRegistry: Record< 'dataset-virtual-greyscale': DatasetVirtualGreyscaleIcon , 'dataset-virtual': DatasetVirtualIcon, 'download': DownloadIcon , - 'dropdown-arrow': DropdownArrowIcon, "edit-alt": EditAltIcon, 'edit': EditIcon , 'email': EmailIcon , 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; From b9baeeb52623b3356faca413d272be099e631f33 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 23 Sep 2020 17:25:42 -0700 Subject: [PATCH 22/29] adding key to storybook map. --- superset-frontend/src/components/Icon/icon.stories.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 => ( - + Date: Wed, 23 Sep 2020 17:26:17 -0700 Subject: [PATCH 23/29] fixing icon component reference --- superset-frontend/src/components/Icon/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 1f47bfd2cbdea..88611931f1c10 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -348,7 +348,7 @@ export const iconsRegistry: Record< 'placeholder': PlaceholderIcon , 'plus-large': PlusLargeIcon , 'plus-small': PlusSmallIcon , - 'plus-solid': PlusSmallIcon , + 'plus-solid': PlusSolidIcon , 'plus': PlusIcon , 'refresh': RefreshIcon , search: SearchIcon, From 97e683056ae8c9111fa9960c9f3dfecbed6c3fcf Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 23 Sep 2020 21:31:37 -0700 Subject: [PATCH 24/29] tweaks to fave star styling to support revised icon --- superset-frontend/src/components/FaveStar.tsx | 2 -- superset-frontend/src/dashboard/components/Header.jsx | 2 +- superset-frontend/src/explore/main.less | 1 - superset-frontend/stylesheets/superset.less | 11 ----------- 4 files changed, 1 insertion(+), 15 deletions(-) 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/dashboard/components/Header.jsx b/superset-frontend/src/dashboard/components/Header.jsx index 1befed2392f34..b3034be23987f 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; } `; 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/stylesheets/superset.less b/superset-frontend/stylesheets/superset.less index 6a06c9259f573..15b706abd64d9 100644 --- a/superset-frontend/stylesheets/superset.less +++ b/superset-frontend/stylesheets/superset.less @@ -529,17 +529,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; From ed7a537cbc3c342f1dad29ba36058cc8987d9497 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 23 Sep 2020 21:33:24 -0700 Subject: [PATCH 25/29] fixing a bad icon inclusion --- .../src/dashboard/components/HeaderActionsDropdown.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 37ad7c915d5cf7a48689d798e43e0b4acafb073b Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 23 Sep 2020 22:03:36 -0700 Subject: [PATCH 26/29] missed a license --- superset-frontend/images/icons/cards.svg | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/superset-frontend/images/icons/cards.svg b/superset-frontend/images/icons/cards.svg index fd6db8de23b54..be59ec53a47e9 100644 --- a/superset-frontend/images/icons/cards.svg +++ b/superset-frontend/images/icons/cards.svg @@ -1,3 +1,21 @@ + From eacc98cd0f5520847404011229d23eead6e167c4 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 24 Sep 2020 09:51:47 -0700 Subject: [PATCH 27/29] touchup to virtual dataset... will tweak later. --- superset-frontend/images/icons/dataset_virtual.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/images/icons/dataset_virtual.svg b/superset-frontend/images/icons/dataset_virtual.svg index fe0573aced2ca..ca15dcb63d5e9 100644 --- a/superset-frontend/images/icons/dataset_virtual.svg +++ b/superset-frontend/images/icons/dataset_virtual.svg @@ -18,5 +18,5 @@ --> - + From b45b5047c24a2ac00657ea7dddf76ac9bb0f4118 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 24 Sep 2020 13:31:05 -0700 Subject: [PATCH 28/29] e2e fix --- .../cypress-base/cypress/integration/dashboard/markdown.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From b299555bebe9a0100b21efbb04c250b89515b467 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Thu, 24 Sep 2020 13:31:48 -0700 Subject: [PATCH 29/29] linting --- .../src/components/Icon/index.tsx | 180 +++++++++--------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx index 88611931f1c10..404a7d5fe85be 100644 --- a/superset-frontend/src/components/Icon/index.tsx +++ b/superset-frontend/src/components/Icon/index.tsx @@ -249,29 +249,29 @@ type IconName = | 'warning-solid' | 'warning' | 'x-large' - | 'x-small' + | 'x-small'; export const iconsRegistry: Record< IconName, React.ComponentType> > = { - 'alert-solid': AlertSolidIcon , - 'alert': AlertIcon , - 'binoculars': BinocularsIcon , - 'bolt-small-run': BoltSmallRunIcon , - 'bolt-small': BoltSmallIcon , - 'bolt': BoltIcon , - 'calendar': CalendarIcon , - 'cancel-solid': CancelSolidIcon , + '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 , + cancel: CancelIcon, 'card-view': CardViewIcon, - 'cards-locked': CardsLockedIcon , - 'cards': CardsIcon , - 'caret-down': CaretDownIcon , - 'caret-left': CaretLeftIcon , - 'caret-right': CaretRightIcon , - 'caret-up': CaretUpIcon , + 'cards-locked': CardsLockedIcon, + cards: CardsIcon, + 'caret-down': CaretDownIcon, + 'caret-left': CaretLeftIcon, + 'caret-right': CaretRightIcon, + 'caret-up': CaretUpIcon, certified: CertifiedIcon, check: CheckIcon, 'checkbox-half': CheckboxHalfIcon, @@ -279,97 +279,97 @@ export const iconsRegistry: Record< 'checkbox-on': CheckboxOnIcon, 'circle-check-solid': CircleCheckSolidIcon, 'circle-check': CircleCheckIcon, - 'circle': CircleIcon , - 'clock': ClockIcon , + circle: CircleIcon, + clock: ClockIcon, close: CloseIcon, - 'code': CodeIcon , - 'cog': CogIcon , - 'collapse': CollapseIcon , - 'color-palette': ColorPaletteIcon , - 'components': ComponentsIcon , - 'copy': CopyIcon , - 'cursor-target': CursorTargeIcon , + 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-greyscale': DatasetVirtualGreyscaleIcon, 'dataset-virtual': DatasetVirtualIcon, - 'download': DownloadIcon , - "edit-alt": EditAltIcon, - 'edit': EditIcon , - 'email': EmailIcon , - 'error-solid-small': ErrorSolidSmallIcon , + 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 , + 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 , + '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, - 'list': ListIcon , - 'location': LocationIcon , - 'lock-locked': LockLockedIcon , - 'lock-unlocked': LockUnlockedIcon , - 'map': MapIcon , - 'message': MessageIcon , - 'minus-solid': MinusSolidIcon , - 'minus': MinusIcon , + 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 , + 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 , + '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 , + server: ServerIcon, share: ShareIcon, 'sort-asc': SortAscIcon, 'sort-desc': SortDescIcon, sort: SortIcon, - 'sql': SQLIcon , - 'table': TableIcon , - 'tag': TagIcon , + sql: SQLIcon, + table: TableIcon, + tag: TagIcon, trash: TrashIcon, - 'triangle-change': TriangleChangeIcon , - 'triangle-down': TriangleDownIcon , - 'triangle-up': TriangleUpIcon , - 'up-level': UpLevelIcon , - 'user': UserIcon , + '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 , + warning: WarningIcon, + 'x-large': XLargeIcon, + 'x-small': XSmallIcon, }; interface IconProps extends SVGProps {