rebased

superset-frontend/package-lock.json

@@ -330,7 +330,10 @@
     "eslint-rules/eslint-plugin-icons": {
       "version": "1.0.0",
       "dev": true,
-      "license": "Apache-2.0"
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "eslint": ">=0.8.0"
+      }
     },
     "eslint-rules/eslint-plugin-theme-colors": {
       "version": "1.0.0",

superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx

@@ -59,14 +59,10 @@ const BackgroundStyleOption = styled.div`
     &.background--transparent:before {
       background-image:
         linear-gradient(45deg, ${theme.colorTextLabel} 25%, transparent 25%),
-        linear-gradient(
-          -45deg,
-          ${theme.colorTextLabel} 25%,
-          transparent 25%
-        ),
+        linear-gradient(-45deg, ${theme.colorTextLabel} 25%, transparent 25%),
         linear-gradient(45deg, transparent 75%, ${theme.colorTextLabel} 75%),
         linear-gradient(-45deg, transparent 75%, ${theme.colorTextLabel} 75%);
-      background-size: ${theme.gridUnit * 2}px ${theme.sizeUnit * 2}px;
+      background-size: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 2}px;
       background-position:
         0 0,
         0 ${theme.sizeUnit}px,

superset-frontend/src/features/alerts/components/NotificationMethod.tsx

@@ -78,7 +78,7 @@ const StyledNotificationMethod = styled.div`
         padding-top: ${theme.sizeUnit}px;
       }
       .anticon {
-        margin-left: ${theme.gridUnit}px;
+        margin-left: ${theme.sizeUnit}px;
       }
     }
 

superset-frontend/src/features/home/RightMenu.tsx

@@ -25,7 +25,7 @@ import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { useQueryParams, BooleanParam } from 'use-query-params';
 import { get, isEmpty } from 'lodash';
-import { Switch } from 'antd-v5';
+import { Switch } from 'src/components/Switch';
 
 import {
   t,

superset-frontend/src/preamble.ts

@@ -23,10 +23,9 @@ import dayjs from 'dayjs';
 import {
   configure,
   makeApi,
-  // eslint-disable-next-line no-restricted-imports
-  supersetTheme, // TODO: DO not import theme directly
   initFeatureFlags,
-  themeObject,
+  // eslint-disable-next-line no-restricted-imports
+  themeObject, // TODO: DO not import theme directly
 } from '@superset-ui/core';
 import setupClient from './setup/setupClient';
 import setupColors from './setup/setupColors';