From ffb5518cbea56dc70088fe522fba92d2e17ed676 Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Sun, 28 Nov 2021 14:49:22 -0600 Subject: [PATCH] explorer: Update bootstrap and dashkit (#21458) * Update dashkit style assets * Update bootstrap to v5 * Fixes for new dashkit and bootstrap * Fix deprecation warnings in dashkit * Bump bootstrap to v5.1 --- explorer/package-lock.json | 62 +- explorer/package.json | 2 +- explorer/src/components/ClusterModal.tsx | 124 ++- .../src/components/ClusterStatusButton.tsx | 6 +- explorer/src/components/MessageBanner.tsx | 2 +- explorer/src/components/Navbar.tsx | 4 +- .../src/components/ProgramLogsCardBody.tsx | 4 +- explorer/src/components/SearchBar.tsx | 4 +- explorer/src/components/SupplyCard.tsx | 6 +- explorer/src/components/TopAccountsCard.tsx | 23 +- explorer/src/components/TpsCard.tsx | 6 +- .../components/account/BlockhashesCard.tsx | 2 +- .../account/ConfigAccountSection.tsx | 14 +- .../account/HistoryCardComponents.tsx | 6 +- .../components/account/MetaplexNFTHeader.tsx | 38 +- .../account/NonceAccountSection.tsx | 6 +- .../components/account/OwnedTokensCard.tsx | 4 +- .../src/components/account/RewardsCard.tsx | 2 +- .../src/components/account/SlotHashesCard.tsx | 4 +- .../account/StakeAccountSection.tsx | 30 +- .../components/account/StakeHistoryCard.tsx | 8 +- .../account/SysvarAccountSection.tsx | 32 +- .../account/TokenAccountSection.tsx | 70 +- .../components/account/TokenHistoryCard.tsx | 22 +- .../account/TokenLargestAccountsCard.tsx | 10 +- .../components/account/UnknownAccountCard.tsx | 14 +- .../UpgradeableLoaderAccountSection.tsx | 44 +- .../components/account/VoteAccountSection.tsx | 10 +- explorer/src/components/account/VotesCard.tsx | 4 +- .../account/history/TokenInstructionsCard.tsx | 2 +- .../account/history/TokenTransfersCard.tsx | 2 +- .../history/TransactionHistoryCard.tsx | 4 +- .../src/components/block/BlockHistoryCard.tsx | 8 +- .../components/block/BlockOverviewCard.tsx | 30 +- .../components/block/BlockProgramsCard.tsx | 6 +- explorer/src/components/common/Account.tsx | 6 +- explorer/src/components/common/Address.tsx | 2 +- .../src/components/common/BalanceDelta.tsx | 6 +- explorer/src/components/common/Copyable.tsx | 6 +- explorer/src/components/common/Epoch.tsx | 2 +- explorer/src/components/common/ErrorCard.tsx | 2 +- explorer/src/components/common/HexData.tsx | 2 +- .../src/components/common/InfoTooltip.tsx | 2 +- .../components/common/InstructionDetails.tsx | 2 +- .../src/components/common/LoadingCard.tsx | 2 +- explorer/src/components/common/Overlay.tsx | 8 +- explorer/src/components/common/Signature.tsx | 2 +- explorer/src/components/common/Slot.tsx | 2 +- .../AssociatedTokenDetailsCard.tsx | 8 +- .../instruction/InstructionCard.tsx | 6 +- .../instruction/MemoDetailsCard.tsx | 6 +- .../src/components/instruction/RawDetails.tsx | 10 +- .../instruction/RawParsedDetails.tsx | 4 +- .../bonfida-bot/CancelOrderDetails.tsx | 24 +- .../bonfida-bot/CollectFeesDetails.tsx | 10 +- .../bonfida-bot/CreateBotDetails.tsx | 22 +- .../bonfida-bot/CreateOrderDetails.tsx | 42 +- .../bonfida-bot/DepositDetails.tsx | 18 +- .../bonfida-bot/InitializeBotDetails.tsx | 12 +- .../instruction/bonfida-bot/RedeemDetails.tsx | 14 +- .../bonfida-bot/SettleFundsDetails.tsx | 24 +- .../bpf-loader/BpfLoaderDetailsCard.tsx | 14 +- .../BpfUpgradeableLoaderDetailsCard.tsx | 6 +- .../mango/AddPerpMarketDetailsCard.tsx | 22 +- .../mango/AddSpotMarketDetailsCard.tsx | 16 +- .../mango/CancelPerpOrderDetailsCard.tsx | 4 +- .../mango/CancelSpotOrderDetailsCard.tsx | 4 +- .../ChangePerpMarketParamsDetailsCard.tsx | 18 +- .../mango/ConsumeEventsDetailsCard.tsx | 2 +- .../mango/GenericPerpMngoDetailsCard.tsx | 2 +- .../mango/GenericSpotMngoDetailsCard.tsx | 2 +- .../mango/PlacePerpOrderDetailsCard.tsx | 12 +- .../mango/PlaceSpotOrderDetailsCard.tsx | 12 +- .../serum/CancelOrderByClientIdDetails.tsx | 10 +- .../serum/CancelOrderByClientIdV2Details.tsx | 14 +- .../instruction/serum/CancelOrderDetails.tsx | 16 +- .../serum/CancelOrderV2Details.tsx | 18 +- .../serum/CloseOpenOrdersDetails.tsx | 10 +- .../serum/ConsumeEventsDetails.tsx | 10 +- .../ConsumeEventsPermissionedDetails.tsx | 12 +- .../serum/DisableMarketDetails.tsx | 6 +- .../serum/InitOpenOrdersDetails.tsx | 10 +- .../serum/InitializeMarketDetailsCard.tsx | 30 +- .../serum/MatchOrdersDetailsCard.tsx | 14 +- .../instruction/serum/NewOrderDetailsCard.tsx | 26 +- .../serum/NewOrderV3DetailsCard.tsx | 38 +- .../instruction/serum/PruneDetails.tsx | 18 +- .../serum/SettleFundsDetailsCard.tsx | 20 +- .../instruction/serum/SweepFeesDetails.tsx | 12 +- .../stake/AuthorizeDetailsCard.tsx | 10 +- .../stake/DeactivateDetailsCard.tsx | 6 +- .../instruction/stake/DelegateDetailsCard.tsx | 8 +- .../stake/InitializeDetailsCard.tsx | 14 +- .../instruction/stake/MergeDetailsCard.tsx | 12 +- .../instruction/stake/SplitDetailsCard.tsx | 10 +- .../instruction/stake/WithdrawDetailsCard.tsx | 10 +- .../system/AllocateDetailsCard.tsx | 6 +- .../system/AllocateWithSeedDetailsCard.tsx | 12 +- .../instruction/system/AssignDetailsCard.tsx | 6 +- .../system/AssignWithSeedDetailsCard.tsx | 10 +- .../instruction/system/CreateDetailsCard.tsx | 12 +- .../system/CreateWithSeedDetailsCard.tsx | 16 +- .../system/NonceAdvanceDetailsCard.tsx | 6 +- .../system/NonceAuthorizeDetailsCard.tsx | 8 +- .../system/NonceInitializeDetailsCard.tsx | 6 +- .../system/NonceWithdrawDetailsCard.tsx | 10 +- .../system/TransferDetailsCard.tsx | 8 +- .../system/TransferWithSeedDetailsCard.tsx | 14 +- .../instruction/token/TokenDetailsCard.tsx | 6 +- .../instruction/vote/VoteDetailsCard.tsx | 14 +- .../src/fonts/feather/{fonts => }/Feather.svg | 0 .../src/fonts/feather/{fonts => }/Feather.ttf | Bin .../fonts/feather/{fonts => }/Feather.woff | Bin explorer/src/fonts/feather/feather.css | 6 +- explorer/src/pages/AccountDetailsPage.tsx | 2 +- explorer/src/pages/ClusterStatsPage.tsx | 22 +- explorer/src/pages/EpochDetailsPage.tsx | 32 +- explorer/src/pages/TransactionDetailsPage.tsx | 40 +- explorer/src/pages/inspector/AccountsCard.tsx | 8 +- .../pages/inspector/AddressWithContext.tsx | 2 +- .../src/pages/inspector/InspectorPage.tsx | 10 +- .../pages/inspector/InstructionsSection.tsx | 14 +- explorer/src/pages/inspector/RawInputCard.tsx | 4 +- .../src/pages/inspector/SignaturesCard.tsx | 8 +- .../src/pages/inspector/SimulatorCard.tsx | 4 +- explorer/src/providers/cluster.tsx | 40 +- explorer/src/scss/_solana-variables.scss | 4 - explorer/src/scss/_solana.scss | 21 +- explorer/src/scss/dashkit/_alert.scss | 20 +- explorer/src/scss/dashkit/_avatar.scss | 42 +- explorer/src/scss/dashkit/_badge.scss | 28 +- explorer/src/scss/dashkit/_breadcrumb.scss | 23 +- explorer/src/scss/dashkit/_buttons.scss | 52 +- explorer/src/scss/dashkit/_card.scss | 63 +- explorer/src/scss/dashkit/_chart.scss | 2 +- explorer/src/scss/dashkit/_checklist.scss | 22 +- explorer/src/scss/dashkit/_close.scss | 6 +- explorer/src/scss/dashkit/_code.scss | 16 - explorer/src/scss/dashkit/_comment.scss | 2 +- explorer/src/scss/dashkit/_custom-forms.scss | 37 - explorer/src/scss/dashkit/_dashkit.scss | 38 - .../{_dropdowns.scss => _dropdown.scss} | 19 +- explorer/src/scss/dashkit/_forms.scss | 278 +----- explorer/src/scss/dashkit/_header.scss | 2 +- explorer/src/scss/dashkit/_icon.scss | 10 +- explorer/src/scss/dashkit/_jumbotron.scss | 15 - explorer/src/scss/dashkit/_kanban.scss | 4 +- explorer/src/scss/dashkit/_list-group.scss | 23 +- explorer/src/scss/dashkit/_main-content.scss | 22 +- explorer/src/scss/dashkit/_mixins.scss | 11 +- explorer/src/scss/dashkit/_modal.scss | 57 +- explorer/src/scss/dashkit/_nav.scss | 20 +- explorer/src/scss/dashkit/_navbar.scss | 66 +- explorer/src/scss/dashkit/_offcanvas.scss | 10 + explorer/src/scss/dashkit/_pagination.scss | 72 ++ explorer/src/scss/dashkit/_popover.scss | 23 +- explorer/src/scss/dashkit/_progress.scss | 8 +- explorer/src/scss/dashkit/_reboot.scss | 16 + explorer/src/scss/dashkit/_root.scss | 10 +- explorer/src/scss/dashkit/_tables.scss | 58 +- explorer/src/scss/dashkit/_theme.scss | 36 + explorer/src/scss/dashkit/_toasts.scss | 4 - explorer/src/scss/dashkit/_type.scss | 17 +- explorer/src/scss/dashkit/_utilities.scss | 8 +- explorer/src/scss/dashkit/_variables.scss | 811 ++++++++++++------ explorer/src/scss/dashkit/_vendor.scss | 7 + explorer/src/scss/dashkit/_vendors.scss | 5 - .../scss/dashkit/dark/_overrides-dark.scss | 27 +- .../scss/dashkit/dark/_variables-dark.scss | 162 ++-- .../src/scss/dashkit/forms/_form-check.scss | 84 ++ .../src/scss/dashkit/forms/_form-control.scss | 90 ++ .../src/scss/dashkit/forms/_form-group.scss | 8 + .../src/scss/dashkit/forms/_form-text.scss | 9 + .../src/scss/dashkit/forms/_input-group.scss | 171 ++++ .../src/scss/dashkit/forms/_validation.scss | 16 + explorer/src/scss/dashkit/mixins/_badge.scss | 9 +- .../src/scss/dashkit/mixins/_breakpoints.scss | 2 +- .../scss/dashkit/utilities/_background.scss | 23 +- .../src/scss/dashkit/utilities/_borders.scss | 48 -- .../src/scss/dashkit/utilities/_sizing.scss | 10 - .../src/scss/dashkit/utilities/_type.scss | 34 - .../src/scss/dashkit/vendor/_choices.scss | 141 +++ .../{vendors => vendor}/_dropzone.scss | 20 +- .../src/scss/dashkit/vendor/_feather.scss | 809 +++++++++++++++++ .../{vendors => vendor}/_flatpickr.scss | 1 - .../src/scss/dashkit/vendor/_highlight.scss | 8 + explorer/src/scss/dashkit/vendor/_list.scss | 44 + .../dashkit/{vendors => vendor}/_quill.scss | 12 +- explorer/src/scss/dashkit/vendors/_list.scss | 11 - .../src/scss/dashkit/vendors/_select2.scss | 128 --- explorer/src/scss/theme-dark.scss | 9 +- explorer/src/utils/index.tsx | 2 +- 192 files changed, 3349 insertions(+), 2150 deletions(-) rename explorer/src/fonts/feather/{fonts => }/Feather.svg (100%) rename explorer/src/fonts/feather/{fonts => }/Feather.ttf (100%) rename explorer/src/fonts/feather/{fonts => }/Feather.woff (100%) delete mode 100644 explorer/src/scss/dashkit/_code.scss delete mode 100644 explorer/src/scss/dashkit/_custom-forms.scss delete mode 100644 explorer/src/scss/dashkit/_dashkit.scss rename explorer/src/scss/dashkit/{_dropdowns.scss => _dropdown.scss} (82%) delete mode 100644 explorer/src/scss/dashkit/_jumbotron.scss create mode 100644 explorer/src/scss/dashkit/_offcanvas.scss create mode 100644 explorer/src/scss/dashkit/_pagination.scss create mode 100644 explorer/src/scss/dashkit/_theme.scss delete mode 100644 explorer/src/scss/dashkit/_toasts.scss create mode 100644 explorer/src/scss/dashkit/_vendor.scss delete mode 100644 explorer/src/scss/dashkit/_vendors.scss create mode 100644 explorer/src/scss/dashkit/forms/_form-check.scss create mode 100644 explorer/src/scss/dashkit/forms/_form-control.scss create mode 100644 explorer/src/scss/dashkit/forms/_form-group.scss create mode 100644 explorer/src/scss/dashkit/forms/_form-text.scss create mode 100644 explorer/src/scss/dashkit/forms/_input-group.scss create mode 100644 explorer/src/scss/dashkit/forms/_validation.scss delete mode 100644 explorer/src/scss/dashkit/utilities/_borders.scss delete mode 100644 explorer/src/scss/dashkit/utilities/_sizing.scss delete mode 100644 explorer/src/scss/dashkit/utilities/_type.scss create mode 100644 explorer/src/scss/dashkit/vendor/_choices.scss rename explorer/src/scss/dashkit/{vendors => vendor}/_dropzone.scss (84%) create mode 100644 explorer/src/scss/dashkit/vendor/_feather.scss rename explorer/src/scss/dashkit/{vendors => vendor}/_flatpickr.scss (99%) create mode 100644 explorer/src/scss/dashkit/vendor/_highlight.scss create mode 100644 explorer/src/scss/dashkit/vendor/_list.scss rename explorer/src/scss/dashkit/{vendors => vendor}/_quill.scss (95%) delete mode 100644 explorer/src/scss/dashkit/vendors/_list.scss delete mode 100644 explorer/src/scss/dashkit/vendors/_select2.scss diff --git a/explorer/package-lock.json b/explorer/package-lock.json index 08ce122ea..69fbe5dee 100644 --- a/explorer/package-lock.json +++ b/explorer/package-lock.json @@ -36,7 +36,7 @@ "@types/socket.io-client": "^3.0.0", "bignumber.js": "^9.0.1", "bn.js": "^5.2.0", - "bootstrap": "^4.6.0", + "bootstrap": "~5.1.3", "bs58": "^4.0.1", "chai": "^4.3.4", "chart.js": "^2.9.4", @@ -4858,6 +4858,16 @@ "node": ">= 8" } }, + "node_modules/@popperjs/core": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", + "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@project-serum/anchor": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz", @@ -8229,16 +8239,15 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "node_modules/bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "funding": { "type": "opencollective", "url": "https://opencollective.com/bootstrap" }, "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.10.2" } }, "node_modules/borsh": { @@ -17948,12 +17957,6 @@ "node": ">=6" } }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "node_modules/js-sha256": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", @@ -20067,17 +20070,6 @@ "node": ">=6" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -31093,6 +31085,12 @@ } } }, + "@popperjs/core": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", + "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==", + "peer": true + }, "@project-serum/anchor": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz", @@ -33721,9 +33719,9 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "requires": {} }, "borsh": { @@ -41199,12 +41197,6 @@ } } }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "js-sha256": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", @@ -42910,12 +42902,6 @@ "ts-pnp": "^1.1.6" } }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "peer": true - }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", diff --git a/explorer/package.json b/explorer/package.json index 46a33c1fc..7f0bb79f9 100644 --- a/explorer/package.json +++ b/explorer/package.json @@ -31,7 +31,7 @@ "@types/socket.io-client": "^3.0.0", "bignumber.js": "^9.0.1", "bn.js": "^5.2.0", - "bootstrap": "^4.6.0", + "bootstrap": "~5.1.3", "bs58": "^4.0.1", "chai": "^4.3.4", "chart.js": "^2.9.4", diff --git a/explorer/src/components/ClusterModal.tsx b/explorer/src/components/ClusterModal.tsx index 93a85abac..fce27bed5 100644 --- a/explorer/src/components/ClusterModal.tsx +++ b/explorer/src/components/ClusterModal.tsx @@ -5,7 +5,6 @@ import { Location } from "history"; import { useCluster, ClusterStatus, - clusterUrl, clusterName, clusterSlug, CLUSTERS, @@ -34,52 +33,50 @@ export function ClusterModal() { return ( <>
-
-
-
e.stopPropagation()}> - - × - +
e.stopPropagation()}> + + × + -

Choose a Cluster

- +

Choose a Cluster

+ - {showDeveloperSettings && ( - <> -
+ {showDeveloperSettings && ( + <> +
-

Developer Settings

-
- Enable custom url param -
- - -
-
-

- Enable this setting to easily connect to a custom cluster - via the "customUrl" url param. -

- - )} -
-
+

Developer Settings

+
+ Enable custom url param +
+ + +
+
+

+ Enable this setting to easily connect to a custom cluster via + the "customUrl" url param. +

+ + )}
- +
+ +
); } @@ -93,8 +90,9 @@ function CustomClusterInput({ activeSuffix, active }: InputProps) { const history = useHistory(); const location = useLocation(); - const customClass = (prefix: string) => - active ? `${prefix}-${activeSuffix}` : ""; + const btnClass = active + ? `border-${activeSuffix} text-${activeSuffix}` + : "btn-white"; const clusterLocation = (location: Location) => { if (customUrl.length > 0) { @@ -118,31 +116,26 @@ function CustomClusterInput({ activeSuffix, active }: InputProps) { const inputTextClass = editing ? "" : "text-muted"; return ( - clusterLocation(location)} - className="btn input-group input-group-merge p-0" - > - setEditing(true)} - onBlur={() => setEditing(false)} - onInput={(e) => onUrlInput(e.currentTarget.value)} - /> -
-
- Custom: -
-
- + <> + + Custom RPC URL + + {active && ( + setEditing(true)} + onBlur={() => setEditing(false)} + onInput={(e) => onUrlInput(e.currentTarget.value)} + /> + )} + ); } function ClusterToggle() { - const { status, cluster, customUrl } = useCluster(); + const { status, cluster } = useCluster(); let activeSuffix = ""; switch (status) { @@ -193,13 +186,10 @@ function ClusterToggle() { return ( - {`${clusterName(net)}: `} - - {clusterUrl(net, customUrl).replace("explorer-", "")} - + {clusterName(net)} ); })} diff --git a/explorer/src/components/ClusterStatusButton.tsx b/explorer/src/components/ClusterStatusButton.tsx index c7efc7cca..9456a1d1c 100644 --- a/explorer/src/components/ClusterStatusButton.tsx +++ b/explorer/src/components/ClusterStatusButton.tsx @@ -36,13 +36,13 @@ function Button() { return `btn d-block btn-${variant}`; }; - const spinnerClasses = "spinner-grow spinner-grow-sm mr-2"; + const spinnerClasses = "spinner-grow spinner-grow-sm me-2"; switch (status) { case ClusterStatus.Connected: return ( - + {statusName} ); @@ -62,7 +62,7 @@ function Button() { case ClusterStatus.Failure: return ( - + {statusName} ); diff --git a/explorer/src/components/MessageBanner.tsx b/explorer/src/components/MessageBanner.tsx index 19b22df92..90175f5d9 100644 --- a/explorer/src/components/MessageBanner.tsx +++ b/explorer/src/components/MessageBanner.tsx @@ -67,7 +67,7 @@ export function MessageBanner() {

- + {message}

{timeframe} diff --git a/explorer/src/components/Navbar.tsx b/explorer/src/components/Navbar.tsx index 70ef7c2f2..16366e95b 100644 --- a/explorer/src/components/Navbar.tsx +++ b/explorer/src/components/Navbar.tsx @@ -24,11 +24,11 @@ export function Navbar() {
-