From 214fc64b9fc9d022222442f15e1409107ddd5aff Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Mon, 26 Aug 2024 12:48:43 -0400 Subject: [PATCH] Renamed CSS --- .../drawers/exports/exports.styles.ts | 6 +-- .../drawers/exports/exportsTable.styles.ts | 12 ++--- .../drawers/exports/exportsTable.tsx | 9 +++- .../costExplorerChart.styles.ts | 8 +-- .../components/cluster/modal/clusterModal.tsx | 4 +- .../components/dataTable/dataTable.styles.ts | 12 ++--- .../components/dataToolbar/basicToolbar.tsx | 2 +- .../dataToolbar/costCategoryValue.tsx | 7 ++- .../dataToolbar/dataToolbar.styles.ts | 4 +- .../components/dataToolbar/dataToolbar.tsx | 2 +- .../components/dataToolbar/tagValue.tsx | 7 ++- .../components/dataToolbar/utils/actions.tsx | 5 +- .../components/dataToolbar/utils/category.tsx | 7 ++- src/routes/components/export/exportModal.tsx | 26 +++++----- .../components/page/noData/noDataState.tsx | 8 ++- .../page/noInstances/noInstancesState.tsx | 14 +++--- .../page/noProviders/noProvidersState.tsx | 8 ++- .../resourceTypeahead/resourceInput.tsx | 3 +- .../selectWrapper/selectTypeaheadWrapper.tsx | 3 +- .../emptyFilterState/emptyFilterState.tsx | 2 +- .../state/errorState/errorState.tsx | 14 +++--- .../state/loadingState/loadingState.tsx | 2 +- .../details/awsDetails/awsDetails.styles.ts | 4 +- .../awsDetails/detailsHeader.styles.ts | 4 +- .../azureDetails/azureDetails.styles.ts | 4 +- .../azureDetails/detailsHeader.styles.ts | 4 +- .../breakdown/breakdownHeader.styles.ts | 12 ++--- .../components/breakdown/breakdownHeader.tsx | 24 ++++----- .../columnManagementModal.tsx | 25 +++++----- .../components/costChart/costChart.styles.ts | 4 +- .../overheadCostChart.styles.ts | 4 +- .../providerDetails/components/cloudData.tsx | 2 +- .../components/clusterData.tsx | 2 +- .../components/component.styles.ts | 12 ++--- .../components/finalization.tsx | 2 +- .../providerDetails/providerDetails.styles.ts | 8 +-- .../providerDetails/providerDetailsModal.tsx | 14 +++--- .../pvcChart/modal/pvcContent.styles.ts | 4 +- .../components/pvcChart/modal/pvcModal.tsx | 4 +- .../components/pvcChart/pvcChart.styles.ts | 4 +- .../details/components/pvcChart/pvcChart.tsx | 16 ++---- .../components/summary/modal/summaryModal.tsx | 4 +- .../components/tag/modal/tagContent.styles.ts | 4 +- .../details/components/tag/modal/tagModal.tsx | 4 +- .../usageChart/usageChart.styles.ts | 4 +- .../gcpDetails/detailsHeader.styles.ts | 4 +- .../details/gcpDetails/gcpDetails.styles.ts | 4 +- .../ibmDetails/detailsHeader.styles.ts | 4 +- .../details/ibmDetails/ibmDetails.styles.ts | 4 +- .../ociDetails/detailsHeader.styles.ts | 4 +- .../details/ociDetails/ociDetails.styles.ts | 4 +- .../clusterInfo/clusterInfo.styles.ts | 12 ++--- .../clusterInfo/clusterInfoContent.tsx | 2 +- .../clusterInfo/clusterInfoModal.tsx | 14 +++--- .../ocpDetails/detailsHeader.styles.ts | 8 +-- .../details/ocpDetails/ocpDetails.styles.ts | 4 +- .../rhelDetails/detailsHeader.styles.ts | 8 +-- .../details/rhelDetails/rhelDetails.styles.ts | 4 +- src/routes/explorer/explorer.styles.ts | 6 +-- src/routes/explorer/explorerFilter.styles.ts | 4 +- src/routes/explorer/explorerHeader.styles.ts | 18 +++---- src/routes/explorer/explorerTable.styles.ts | 12 ++--- .../optimizationsBreakdown.styles.ts | 4 +- .../optimizationsDetails.styles.ts | 4 +- src/routes/overview/overview.styles.ts | 10 ++-- src/routes/overview/overview.tsx | 3 +- .../calculations/calculations.styles.ts | 6 +-- .../costCategory/costCategory.styles.ts | 6 +-- .../costModels/components/addPriceList.tsx | 8 +-- .../costModels/components/errorState.tsx | 3 +- .../components/inputs/rateInput.styles.ts | 4 +- .../components/rateForm/rateForm.tsx | 2 +- .../components/rateForm/taggingRatesForm.tsx | 3 +- .../costModels/costModel/addRateModal.tsx | 11 +---- .../costModels/costModel/addSourceWizard.tsx | 15 +----- .../costModels/costModel/costCalc.styles.ts | 8 +-- .../costModel/costModelInfo.styles.ts | 6 +-- .../costModels/costModel/costModelInfo.tsx | 15 +++--- .../costModel/costModelsDetails.styles.ts | 10 ++-- .../settings/costModels/costModel/dialog.tsx | 9 +--- .../settings/costModels/costModel/header.tsx | 6 +-- .../costModels/costModel/priceListTable.tsx | 6 ++- .../costModels/costModel/sourcesTable.tsx | 3 +- .../settings/costModels/costModel/table.tsx | 13 +++-- .../costModels/costModel/updateCostModel.tsx | 13 +---- .../costModel/updateDistributionDialog.tsx | 31 ++++++------ .../costModel/updateMarkupDialog.tsx | 49 +++++++++---------- .../costModels/costModel/updateRateModel.tsx | 11 +---- .../costModelWizard/costModelWizard.tsx | 14 +----- .../costModelWizard/distribution.tsx | 15 ++---- .../costModels/costModelWizard/markup.tsx | 4 +- .../costModelWizard/priceListTable.tsx | 8 ++- .../costModels/costModelWizard/review.tsx | 21 +++----- .../costModels/costModelWizard/table.tsx | 2 +- .../costModelsDetails.styles.ts | 4 +- .../costModels/costModelsDetails/dialog.tsx | 5 +- .../costModelsDetails/emptyStateBase.tsx | 4 +- .../costModels/costModelsDetails/table.tsx | 3 +- .../costModelsDetails/utils/dialog.tsx | 6 ++- .../costModelsDetails/utils/filters.tsx | 21 ++++++-- .../platformProjects.styles.ts | 6 +-- src/routes/settings/settings.styles.ts | 6 +-- .../settings/tagLabels/tagLabels.styles.ts | 4 +- src/routes/settings/tagLabels/tagLabels.tsx | 3 +- .../childTagMapping/childTagMapping.tsx | 16 +++--- .../childTags/childTagsTable.styles.ts | 6 +-- .../deleteTagMapping/deleteTagMapping.tsx | 14 +++--- .../deleteTagMappingAction.tsx | 3 +- .../parentTagMapping.styles.ts | 18 +++---- .../parentTagMapping/parentTagMapping.tsx | 22 ++++----- .../parentTagMappingEmptyState.tsx | 12 +++-- .../parentTagMappingReview.tsx | 14 ++---- .../parentTags/parentTagsTable.styles.ts | 6 +-- .../tagLabels/tagMapping/tagMapping.styles.ts | 4 +- .../tagMapping/tagMappingEmptyState.tsx | 8 ++- .../settings/tagLabels/tags/tags.styles.ts | 4 +- src/styles/theme.ts | 11 ++--- 117 files changed, 458 insertions(+), 515 deletions(-) diff --git a/src/components/drawers/exports/exports.styles.ts b/src/components/drawers/exports/exports.styles.ts index e0ffabf43..4846d75e0 100644 --- a/src/components/drawers/exports/exports.styles.ts +++ b/src/components/drawers/exports/exports.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; @@ -18,12 +18,12 @@ export const styles = { alignItems: 'center', }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, toolbarContainer: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/components/drawers/exports/exportsTable.styles.ts b/src/components/drawers/exports/exportsTable.styles.ts index 03c215f93..2d892ab38 100644 --- a/src/components/drawers/exports/exportsTable.styles.ts +++ b/src/components/drawers/exports/exportsTable.styles.ts @@ -1,23 +1,23 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_danger_color_200 from '@patternfly/react-tokens/dist/js/global_danger_color_200'; -import global_FontSize_sm from '@patternfly/react-tokens/dist/js/global_FontSize_sm'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_color_status_danger_200 from '@patternfly/react-tokens/dist/js/global_color_status_danger_200'; +import global_font_size_sm from '@patternfly/react-tokens/dist/js/global_font_size_sm'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_xl from '@patternfly/react-tokens/dist/js/global_spacer_xl'; import type React from 'react'; export const styles = { emptyState: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, display: 'flex', justifyContent: 'center', paddingTop: global_spacer_xl.value, width: '100%', }, failed: { - color: global_danger_color_200.value, + color: global_color_status_danger_200.value, }, failedButton: { - fontSize: global_FontSize_sm.value, + fontSize: global_font_size_sm.value, }, failedHeader: { marginLeft: global_spacer_md.value, diff --git a/src/components/drawers/exports/exportsTable.tsx b/src/components/drawers/exports/exportsTable.tsx index a4fbe9544..9770d7cea 100644 --- a/src/components/drawers/exports/exportsTable.tsx +++ b/src/components/drawers/exports/exportsTable.tsx @@ -138,7 +138,11 @@ class ExportsTableBase extends React.Component{intl.formatMessage(messages.noExportsStateTitle)}}> + {intl.formatMessage(messages.noExportsStateTitle)}} + > {intl.formatMessage(messages.exportsEmptyState)} + > ); diff --git a/src/routes/components/dataToolbar/dataToolbar.styles.ts b/src/routes/components/dataToolbar/dataToolbar.styles.ts index 054c1a36f..5c835047e 100644 --- a/src/routes/components/dataToolbar/dataToolbar.styles.ts +++ b/src/routes/components/dataToolbar/dataToolbar.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,7 +7,7 @@ export const styles = { marginRight: global_spacer_md.value, }, toolbarContainer: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/components/dataToolbar/dataToolbar.tsx b/src/routes/components/dataToolbar/dataToolbar.tsx index 30ebeb824..f3d849af3 100644 --- a/src/routes/components/dataToolbar/dataToolbar.tsx +++ b/src/routes/components/dataToolbar/dataToolbar.tsx @@ -787,7 +787,7 @@ export class DataToolbarBase extends React.Component )} - + {pagination} diff --git a/src/routes/components/dataToolbar/tagValue.tsx b/src/routes/components/dataToolbar/tagValue.tsx index 4f13a00f7..389b844f3 100644 --- a/src/routes/components/dataToolbar/tagValue.tsx +++ b/src/routes/components/dataToolbar/tagValue.tsx @@ -146,14 +146,13 @@ class TagValueBase extends React.Component { /> - + > ); diff --git a/src/routes/components/dataToolbar/utils/actions.tsx b/src/routes/components/dataToolbar/utils/actions.tsx index 748c8b464..f09599d65 100644 --- a/src/routes/components/dataToolbar/utils/actions.tsx +++ b/src/routes/components/dataToolbar/utils/actions.tsx @@ -38,10 +38,11 @@ export const getExportButton = ({ return ( - + > )} diff --git a/src/routes/components/export/exportModal.tsx b/src/routes/components/export/exportModal.tsx index aa4ee4721..8029a839f 100644 --- a/src/routes/components/export/exportModal.tsx +++ b/src/routes/components/export/exportModal.tsx @@ -1,20 +1,18 @@ import type { MessageDescriptor } from '@formatjs/intl/src/types'; import { - Alert, - Button, - ButtonVariant, - Form, - FormGroup, - Grid, - GridItem, - HelperText, - HelperTextItem, - Radio, - TextInput + Alert, + Button, + ButtonVariant, + Form, + FormGroup, + Grid, + GridItem, + HelperText, + HelperTextItem, + Radio, + TextInput, } from '@patternfly/react-core'; -import { - Modal -} from '@patternfly/react-core/deprecated'; +import { Modal } from '@patternfly/react-core/deprecated'; import type { ReportPathsType, ReportType } from 'api/reports/report'; import type { AxiosError } from 'axios'; import { format } from 'date-fns'; diff --git a/src/routes/components/page/noData/noDataState.tsx b/src/routes/components/page/noData/noDataState.tsx index 9d80faedb..b5c4728d6 100644 --- a/src/routes/components/page/noData/noDataState.tsx +++ b/src/routes/components/page/noData/noDataState.tsx @@ -26,7 +26,13 @@ class NoDataStateBase extends React.Component { const { detailsComponent, intl, showReload = true } = this.props; return ( - + {intl.formatMessage(messages.noDataStateDesc)} {detailsComponent && {detailsComponent}} diff --git a/src/routes/components/page/noInstances/noInstancesState.tsx b/src/routes/components/page/noInstances/noInstancesState.tsx index 409a06a16..39d790de6 100644 --- a/src/routes/components/page/noInstances/noInstancesState.tsx +++ b/src/routes/components/page/noInstances/noInstancesState.tsx @@ -1,8 +1,4 @@ -import { - EmptyState, - EmptyStateBody, - EmptyStateVariant, -} from '@patternfly/react-core'; +import { EmptyState, EmptyStateBody, EmptyStateVariant } from '@patternfly/react-core'; import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import messages from 'locales/messages'; import React from 'react'; @@ -20,7 +16,13 @@ class NoInstancesStateBase extends React.Component { const { intl } = this.props; return ( - + {intl.formatMessage(messages.noInstancesDesc)} ); diff --git a/src/routes/components/page/noProviders/noProvidersState.tsx b/src/routes/components/page/noProviders/noProvidersState.tsx index a9618b5ce..5d6667352 100644 --- a/src/routes/components/page/noProviders/noProvidersState.tsx +++ b/src/routes/components/page/noProviders/noProvidersState.tsx @@ -82,7 +82,13 @@ class NoProvidersStateBase extends React.Component { icon = CostIcon; } return ( - + {intl.formatMessage(descKey)} {detailsComponent && {detailsComponent}} diff --git a/src/routes/components/resourceTypeahead/resourceInput.tsx b/src/routes/components/resourceTypeahead/resourceInput.tsx index 997f76105..868358ce3 100644 --- a/src/routes/components/resourceTypeahead/resourceInput.tsx +++ b/src/routes/components/resourceTypeahead/resourceInput.tsx @@ -68,7 +68,8 @@ const ResourceInput: React.FC = ({ /> {search && search.length && ( - diff --git a/src/routes/details/components/columnManagement/columnManagementModal.tsx b/src/routes/details/components/columnManagement/columnManagementModal.tsx index 48b189f25..ebedabf36 100644 --- a/src/routes/details/components/columnManagement/columnManagementModal.tsx +++ b/src/routes/details/components/columnManagement/columnManagementModal.tsx @@ -1,19 +1,16 @@ import { - Button, - ButtonVariant, - DataList, - DataListCell, - DataListCheck, - DataListItem, - DataListItemCells, - DataListItemRow, - Content, - ContentVariants + Button, + ButtonVariant, + Content, + ContentVariants, + DataList, + DataListCell, + DataListCheck, + DataListItem, + DataListItemCells, + DataListItemRow, } from '@patternfly/react-core'; -import { - Modal, - ModalVariant -} from '@patternfly/react-core/deprecated'; +import { Modal, ModalVariant } from '@patternfly/react-core/deprecated'; import messages from 'locales/messages'; import React from 'react'; import type { MessageDescriptor, WrappedComponentProps } from 'react-intl'; diff --git a/src/routes/details/components/costChart/costChart.styles.ts b/src/routes/details/components/costChart/costChart.styles.ts index 6bdbf0e25..92020973a 100644 --- a/src/routes/details/components/costChart/costChart.styles.ts +++ b/src/routes/details/components/costChart/costChart.styles.ts @@ -1,4 +1,4 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import global_spacer_3xl from '@patternfly/react-tokens/dist/js/global_spacer_3xl'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,7 +7,7 @@ export const chartStyles = { chartHeight: 150, chartWidth: 475, subTitle: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, }; diff --git a/src/routes/details/components/overheadCostChart/overheadCostChart.styles.ts b/src/routes/details/components/overheadCostChart/overheadCostChart.styles.ts index b70708a55..a84b2de98 100644 --- a/src/routes/details/components/overheadCostChart/overheadCostChart.styles.ts +++ b/src/routes/details/components/overheadCostChart/overheadCostChart.styles.ts @@ -1,4 +1,4 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import global_spacer_3xl from '@patternfly/react-tokens/dist/js/global_spacer_3xl'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,7 +7,7 @@ export const chartStyles = { chartHeight: 150, chartWidth: 525, subTitle: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, }; diff --git a/src/routes/details/components/providerDetails/components/cloudData.tsx b/src/routes/details/components/providerDetails/components/cloudData.tsx index b67c8ebdd..52214af6c 100644 --- a/src/routes/details/components/providerDetails/components/cloudData.tsx +++ b/src/routes/details/components/providerDetails/components/cloudData.tsx @@ -1,4 +1,4 @@ -import { ProgressStep, ProgressStepper, Content, ContentVariants } from '@patternfly/react-core'; +import { Content, ContentVariants, ProgressStep, ProgressStepper } from '@patternfly/react-core'; import type { Provider } from 'api/providers'; import messages from 'locales/messages'; import React from 'react'; diff --git a/src/routes/details/components/providerDetails/components/clusterData.tsx b/src/routes/details/components/providerDetails/components/clusterData.tsx index 192a5b7b7..b11ccb2cd 100644 --- a/src/routes/details/components/providerDetails/components/clusterData.tsx +++ b/src/routes/details/components/providerDetails/components/clusterData.tsx @@ -1,4 +1,4 @@ -import { ProgressStep, ProgressStepper, Content, ContentVariants } from '@patternfly/react-core'; +import { Content, ContentVariants, ProgressStep, ProgressStepper } from '@patternfly/react-core'; import type { Provider } from 'api/providers'; import messages from 'locales/messages'; import React from 'react'; diff --git a/src/routes/details/components/providerDetails/components/component.styles.ts b/src/routes/details/components/providerDetails/components/component.styles.ts index 44aa60ec0..a219fb9f9 100644 --- a/src/routes/details/components/providerDetails/components/component.styles.ts +++ b/src/routes/details/components/providerDetails/components/component.styles.ts @@ -1,5 +1,5 @@ -import global_disabled_color_100 from '@patternfly/react-tokens/dist/js/global_disabled_color_100'; -import global_FontSize_xs from '@patternfly/react-tokens/dist/js/global_FontSize_xs'; +import global_color_disabled_100 from '@patternfly/react-tokens/dist/js/global_color_disabled_100'; +import global_font_size_body_sm from '@patternfly/react-tokens/dist/js/global_font_size_body_sm'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; @@ -7,17 +7,17 @@ import type React from 'react'; export const styles = { description: { - color: global_disabled_color_100.value, - fontSize: global_FontSize_xs.value, + color: global_color_disabled_100.value, + fontSize: global_font_size_body_sm.value, }, sourceLink: { - fontSize: global_FontSize_xs.value, + fontSize: global_font_size_body_sm.value, }, spacingRight: { marginRight: global_spacer_md.value, }, statusIcon: { - fontSize: global_FontSize_xs.value, + fontSize: global_font_size_body_sm.value, paddingRight: global_spacer_sm.value, }, stepper: { diff --git a/src/routes/details/components/providerDetails/components/finalization.tsx b/src/routes/details/components/providerDetails/components/finalization.tsx index 0949b8552..98e38d2b7 100644 --- a/src/routes/details/components/providerDetails/components/finalization.tsx +++ b/src/routes/details/components/providerDetails/components/finalization.tsx @@ -1,4 +1,4 @@ -import { ProgressStep, ProgressStepper, Content, ContentVariants } from '@patternfly/react-core'; +import { Content, ContentVariants, ProgressStep, ProgressStepper } from '@patternfly/react-core'; import type { Provider } from 'api/providers'; import { ProviderType } from 'api/providers'; import messages from 'locales/messages'; diff --git a/src/routes/details/components/providerDetails/providerDetails.styles.ts b/src/routes/details/components/providerDetails/providerDetails.styles.ts index baedf2d15..cc8a73649 100644 --- a/src/routes/details/components/providerDetails/providerDetails.styles.ts +++ b/src/routes/details/components/providerDetails/providerDetails.styles.ts @@ -1,12 +1,12 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_FontSize_xs from '@patternfly/react-tokens/dist/js/global_FontSize_xs'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_font_size_body_sm from '@patternfly/react-tokens/dist/js/global_font_size_body_sm'; import type React from 'react'; export const styles = { dataDetailsButton: { - fontSize: global_FontSize_xs.value, + fontSize: global_font_size_body_sm.value, }, loading: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, }, } as { [className: string]: React.CSSProperties }; diff --git a/src/routes/details/components/providerDetails/providerDetailsModal.tsx b/src/routes/details/components/providerDetails/providerDetailsModal.tsx index e0fc66a37..bf866d16a 100644 --- a/src/routes/details/components/providerDetails/providerDetailsModal.tsx +++ b/src/routes/details/components/providerDetails/providerDetailsModal.tsx @@ -1,13 +1,11 @@ import { - Button, - ButtonVariant, - Modal /* data-codemods */, - ModalBody /* data-codemods */, - ModalHeader /* data-codemods */ + Button, + ButtonVariant, + Modal /* data-codemods */, + ModalBody /* data-codemods */, + ModalHeader /* data-codemods */, } from '@patternfly/react-core'; -import { - ModalVariant -} from '@patternfly/react-core/next'; +import { ModalVariant } from '@patternfly/react-core/next'; import type { ProviderType } from 'api/providers'; import messages from 'locales/messages'; import React, { useState } from 'react'; diff --git a/src/routes/details/components/pvcChart/modal/pvcContent.styles.ts b/src/routes/details/components/pvcChart/modal/pvcContent.styles.ts index 0489edcad..497651975 100644 --- a/src/routes/details/components/pvcChart/modal/pvcContent.styles.ts +++ b/src/routes/details/components/pvcChart/modal/pvcContent.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,7 +7,7 @@ export const styles = { overflow: 'auto', }, loading: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, minHeight: '520px', }, pagination: { diff --git a/src/routes/details/components/pvcChart/modal/pvcModal.tsx b/src/routes/details/components/pvcChart/modal/pvcModal.tsx index 236fd35a5..2d6d642dd 100644 --- a/src/routes/details/components/pvcChart/modal/pvcModal.tsx +++ b/src/routes/details/components/pvcChart/modal/pvcModal.tsx @@ -1,6 +1,4 @@ -import { - Modal -} from '@patternfly/react-core/deprecated'; +import { Modal } from '@patternfly/react-core/deprecated'; import React from 'react'; import type { WrappedComponentProps } from 'react-intl'; import { injectIntl } from 'react-intl'; diff --git a/src/routes/details/components/pvcChart/pvcChart.styles.ts b/src/routes/details/components/pvcChart/pvcChart.styles.ts index 37316a3f7..9767f8c7c 100644 --- a/src/routes/details/components/pvcChart/pvcChart.styles.ts +++ b/src/routes/details/components/pvcChart/pvcChart.styles.ts @@ -1,4 +1,4 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_xl from '@patternfly/react-tokens/dist/js/global_spacer_xl'; @@ -12,7 +12,7 @@ export const styles = { marginBottom: global_spacer_md.value, }, capacity: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, description: { display: 'flex', diff --git a/src/routes/details/components/pvcChart/pvcChart.tsx b/src/routes/details/components/pvcChart/pvcChart.tsx index 5e9893132..cbf6d06df 100644 --- a/src/routes/details/components/pvcChart/pvcChart.tsx +++ b/src/routes/details/components/pvcChart/pvcChart.tsx @@ -2,13 +2,7 @@ import 'routes/components/charts/common/chart.scss'; import './pvc.scss'; import { ChartBullet } from '@patternfly/react-charts'; -import { - Divider, - Skeleton, - Content, - TextListItemVariants, - TextListVariants, -} from '@patternfly/react-core'; +import { Content, Divider, Skeleton, TextListItemVariants, TextListVariants } from '@patternfly/react-core'; import type { OcpQuery } from 'api/queries/ocpQuery'; import { parseQuery } from 'api/queries/ocpQuery'; import type { Query } from 'api/queries/query'; @@ -221,9 +215,7 @@ class PvcChartBase extends React.Component {
- - {intl.formatMessage(messages.names, { count: 1 })} - + {intl.formatMessage(messages.names, { count: 1 })} {item.persistent_volume_claim} {intl.formatMessage(messages.cluster)} {item.clusters ? item.clusters[0] : null} @@ -234,9 +226,7 @@ class PvcChartBase extends React.Component {     {intl.formatMessage(messages.storageClass)} - - {item.storage_class ? item.storage_class[0] : null} - + {item.storage_class ? item.storage_class[0] : null}
diff --git a/src/routes/details/components/summary/modal/summaryModal.tsx b/src/routes/details/components/summary/modal/summaryModal.tsx index 90faa27ca..4754674a4 100644 --- a/src/routes/details/components/summary/modal/summaryModal.tsx +++ b/src/routes/details/components/summary/modal/summaryModal.tsx @@ -1,6 +1,4 @@ -import { - Modal -} from '@patternfly/react-core/deprecated'; +import { Modal } from '@patternfly/react-core/deprecated'; import type { Query } from 'api/queries/query'; import type { ReportPathsType } from 'api/reports/report'; import messages from 'locales/messages'; diff --git a/src/routes/details/components/tag/modal/tagContent.styles.ts b/src/routes/details/components/tag/modal/tagContent.styles.ts index 8e64e6a31..8fc33df18 100644 --- a/src/routes/details/components/tag/modal/tagContent.styles.ts +++ b/src/routes/details/components/tag/modal/tagContent.styles.ts @@ -1,10 +1,10 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import type React from 'react'; export const styles = { dataListHeading: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, groupByHeading: { marginBottom: global_spacer_lg.value, diff --git a/src/routes/details/components/tag/modal/tagModal.tsx b/src/routes/details/components/tag/modal/tagModal.tsx index 50059c756..9a518933c 100644 --- a/src/routes/details/components/tag/modal/tagModal.tsx +++ b/src/routes/details/components/tag/modal/tagModal.tsx @@ -1,6 +1,4 @@ -import { - Modal -} from '@patternfly/react-core/deprecated'; +import { Modal } from '@patternfly/react-core/deprecated'; import type { Query } from 'api/queries/query'; import { getQuery, parseQuery } from 'api/queries/query'; import type { Tag, TagData, TagPathsType } from 'api/tags/tag'; diff --git a/src/routes/details/components/usageChart/usageChart.styles.ts b/src/routes/details/components/usageChart/usageChart.styles.ts index 33eebc5a6..7e0b7e3f9 100644 --- a/src/routes/details/components/usageChart/usageChart.styles.ts +++ b/src/routes/details/components/usageChart/usageChart.styles.ts @@ -1,4 +1,4 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -10,7 +10,7 @@ export const styles = { marginBottom: global_spacer_md.value, }, capacity: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, legendSkeleton: { marginTop: global_spacer_md.value, diff --git a/src/routes/details/gcpDetails/detailsHeader.styles.ts b/src/routes/details/gcpDetails/detailsHeader.styles.ts index d55ff51cc..e6cb95beb 100644 --- a/src/routes/details/gcpDetails/detailsHeader.styles.ts +++ b/src/routes/details/gcpDetails/detailsHeader.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; @@ -16,7 +16,7 @@ export const styles = { display: 'flex', }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, perspective: { diff --git a/src/routes/details/gcpDetails/gcpDetails.styles.ts b/src/routes/details/gcpDetails/gcpDetails.styles.ts index 7ac804174..434b4de90 100644 --- a/src/routes/details/gcpDetails/gcpDetails.styles.ts +++ b/src/routes/details/gcpDetails/gcpDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; @@ -15,7 +15,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, padding: global_spacer_md.value, }, tableContainer: { diff --git a/src/routes/details/ibmDetails/detailsHeader.styles.ts b/src/routes/details/ibmDetails/detailsHeader.styles.ts index d55ff51cc..e6cb95beb 100644 --- a/src/routes/details/ibmDetails/detailsHeader.styles.ts +++ b/src/routes/details/ibmDetails/detailsHeader.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; @@ -16,7 +16,7 @@ export const styles = { display: 'flex', }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, perspective: { diff --git a/src/routes/details/ibmDetails/ibmDetails.styles.ts b/src/routes/details/ibmDetails/ibmDetails.styles.ts index c22caf82f..f129f7a84 100644 --- a/src/routes/details/ibmDetails/ibmDetails.styles.ts +++ b/src/routes/details/ibmDetails/ibmDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; @@ -15,7 +15,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/details/ociDetails/detailsHeader.styles.ts b/src/routes/details/ociDetails/detailsHeader.styles.ts index d55ff51cc..e6cb95beb 100644 --- a/src/routes/details/ociDetails/detailsHeader.styles.ts +++ b/src/routes/details/ociDetails/detailsHeader.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; @@ -16,7 +16,7 @@ export const styles = { display: 'flex', }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, perspective: { diff --git a/src/routes/details/ociDetails/ociDetails.styles.ts b/src/routes/details/ociDetails/ociDetails.styles.ts index 451ce3248..648f6664b 100644 --- a/src/routes/details/ociDetails/ociDetails.styles.ts +++ b/src/routes/details/ociDetails/ociDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -16,7 +16,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfo.styles.ts b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfo.styles.ts index c20bdbf4e..ce4fc8095 100644 --- a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfo.styles.ts +++ b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfo.styles.ts @@ -1,21 +1,21 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_FontSize_xs from '@patternfly/react-tokens/dist/js/global_FontSize_xs'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_color_status_warning_100 from '@patternfly/react-tokens/dist/js/global_color_status_warning_100'; +import global_font_size_body_sm from '@patternfly/react-tokens/dist/js/global_font_size_body_sm'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; -import global_warning_color_100 from '@patternfly/react-tokens/dist/js/global_warning_color_100'; import type React from 'react'; export const styles = { clusterInfoButton: { - fontSize: global_FontSize_xs.value, + fontSize: global_font_size_body_sm.value, }, loading: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, }, spacingRight: { marginRight: global_spacer_md.value, }, updateAvailable: { - color: global_warning_color_100.value, + color: global_color_status_warning_100.value, paddingLeft: '5px', }, } as { [className: string]: React.CSSProperties }; diff --git a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoContent.tsx b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoContent.tsx index 4222029cc..a050bbea6 100644 --- a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoContent.tsx +++ b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoContent.tsx @@ -1,6 +1,6 @@ import './clusterInfoContent.scss'; -import { Icon, Content, ContentVariants } from '@patternfly/react-core'; +import { Content, ContentVariants, Icon } from '@patternfly/react-core'; import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon'; import type { Providers } from 'api/providers'; import { ProviderType } from 'api/providers'; diff --git a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoModal.tsx b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoModal.tsx index b9635cb5f..957f46bd5 100644 --- a/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoModal.tsx +++ b/src/routes/details/ocpBreakdown/clusterInfo/clusterInfoModal.tsx @@ -1,13 +1,11 @@ import { - Button, - ButtonVariant, - Modal /* data-codemods */, - ModalBody /* data-codemods */, - ModalHeader /* data-codemods */ + Button, + ButtonVariant, + Modal /* data-codemods */, + ModalBody /* data-codemods */, + ModalHeader /* data-codemods */, } from '@patternfly/react-core'; -import { - ModalVariant -} from '@patternfly/react-core/next'; +import { ModalVariant } from '@patternfly/react-core/next'; import messages from 'locales/messages'; import React, { useState } from 'react'; import { useIntl } from 'react-intl'; diff --git a/src/routes/details/ocpDetails/detailsHeader.styles.ts b/src/routes/details/ocpDetails/detailsHeader.styles.ts index caa2a81fe..527176ea0 100644 --- a/src/routes/details/ocpDetails/detailsHeader.styles.ts +++ b/src/routes/details/ocpDetails/detailsHeader.styles.ts @@ -1,5 +1,5 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_FontSize_md from '@patternfly/react-tokens/dist/js/global_FontSize_md'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_font_size_md from '@patternfly/react-tokens/dist/js/global_font_size_md'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; @@ -17,7 +17,7 @@ export const styles = { display: 'flex', }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, perspective: { @@ -31,7 +31,7 @@ export const styles = { verticalAlign: 'middle', }, infoIcon: { - fontSize: global_FontSize_md.value, + fontSize: global_font_size_md.value, }, infoTitle: { fontWeight: 'bold', diff --git a/src/routes/details/ocpDetails/ocpDetails.styles.ts b/src/routes/details/ocpDetails/ocpDetails.styles.ts index 1ee4315c6..eb661e2ad 100644 --- a/src/routes/details/ocpDetails/ocpDetails.styles.ts +++ b/src/routes/details/ocpDetails/ocpDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -16,7 +16,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/details/rhelDetails/detailsHeader.styles.ts b/src/routes/details/rhelDetails/detailsHeader.styles.ts index eab228cfa..61934b7da 100644 --- a/src/routes/details/rhelDetails/detailsHeader.styles.ts +++ b/src/routes/details/rhelDetails/detailsHeader.styles.ts @@ -1,5 +1,5 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_FontSize_md from '@patternfly/react-tokens/dist/js/global_FontSize_md'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_font_size_md from '@patternfly/react-tokens/dist/js/global_font_size_md'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; @@ -17,14 +17,14 @@ export const styles = { display: 'flex', }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, info: { verticalAlign: 'middle', }, infoIcon: { - fontSize: global_FontSize_md.value, + fontSize: global_font_size_md.value, }, infoTitle: { fontWeight: 'bold', diff --git a/src/routes/details/rhelDetails/rhelDetails.styles.ts b/src/routes/details/rhelDetails/rhelDetails.styles.ts index 20be10cf3..0c93b143e 100644 --- a/src/routes/details/rhelDetails/rhelDetails.styles.ts +++ b/src/routes/details/rhelDetails/rhelDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -16,7 +16,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/explorer/explorer.styles.ts b/src/routes/explorer/explorer.styles.ts index f2feb3dd9..6d74bf15f 100644 --- a/src/routes/explorer/explorer.styles.ts +++ b/src/routes/explorer/explorer.styles.ts @@ -1,10 +1,10 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; export const styles = { chartContainer: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, marginLeft: global_spacer_lg.value, marginRight: global_spacer_lg.value, paddingRight: global_spacer_lg.value, @@ -22,7 +22,7 @@ export const styles = { marginRight: global_spacer_lg.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/explorer/explorerFilter.styles.ts b/src/routes/explorer/explorerFilter.styles.ts index 560bcf952..1ebd8237a 100644 --- a/src/routes/explorer/explorerFilter.styles.ts +++ b/src/routes/explorer/explorerFilter.styles.ts @@ -1,10 +1,10 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; import type React from 'react'; export const styles = { toolbarContainer: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingTop: global_spacer_sm.var, }, } as { [className: string]: React.CSSProperties }; diff --git a/src/routes/explorer/explorerHeader.styles.ts b/src/routes/explorer/explorerHeader.styles.ts index 8ddf9e3f2..7f0800fe0 100644 --- a/src/routes/explorer/explorerHeader.styles.ts +++ b/src/routes/explorer/explorerHeader.styles.ts @@ -1,10 +1,10 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_Color_100 from '@patternfly/react-tokens/dist/js/global_Color_100'; -import global_Color_200 from '@patternfly/react-tokens/dist/js/global_Color_200'; -import global_FontSize_sm from '@patternfly/react-tokens/dist/js/global_FontSize_sm'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_font_size_sm from '@patternfly/react-tokens/dist/js/global_font_size_sm'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; +import global_text_color_100 from '@patternfly/react-tokens/dist/js/global_text_color_100'; +import global_text_color_200 from '@patternfly/react-tokens/dist/js/global_text_color_200'; import type React from 'react'; export const styles = { @@ -18,15 +18,15 @@ export const styles = { marginRight: global_spacer_md.var, }, costLabelUnit: { - fontSize: global_FontSize_sm.value, - color: global_Color_100.var, + fontSize: global_font_size_sm.value, + color: global_text_color_100.var, }, costLabelDate: { - fontSize: global_FontSize_sm.value, - color: global_Color_200.var, + fontSize: global_font_size_sm.value, + color: global_text_color_200.var, }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, paddingBottom: global_spacer_md.var, paddingLeft: global_spacer_lg.var, paddingRight: global_spacer_lg.var, diff --git a/src/routes/explorer/explorerTable.styles.ts b/src/routes/explorer/explorerTable.styles.ts index 77e86fc7a..ed20cb05e 100644 --- a/src/routes/explorer/explorerTable.styles.ts +++ b/src/routes/explorer/explorerTable.styles.ts @@ -1,6 +1,6 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_disabled_color_100 from '@patternfly/react-tokens/dist/js/global_disabled_color_100'; -import global_FontSize_xs from '@patternfly/react-tokens/dist/js/global_FontSize_xs'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_color_disabled_100 from '@patternfly/react-tokens/dist/js/global_color_disabled_100'; +import global_font_size_body_sm from '@patternfly/react-tokens/dist/js/global_font_size_body_sm'; import global_spacer_3xl from '@patternfly/react-tokens/dist/js/global_spacer_3xl'; import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'; import type React from 'react'; @@ -10,7 +10,7 @@ export const styles = { minWidth: '50px', }, emptyState: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, display: 'flex', justifyContent: 'center', paddingTop: global_spacer_3xl.value, @@ -24,7 +24,7 @@ export const styles = { bottom: global_spacer_xs.value, }, infoDescription: { - color: global_disabled_color_100.value, - fontSize: global_FontSize_xs.value, + color: global_color_disabled_100.value, + fontSize: global_font_size_body_sm.value, }, } as { [className: string]: React.CSSProperties }; diff --git a/src/routes/optimizations/optimizationsBreakdown/optimizationsBreakdown.styles.ts b/src/routes/optimizations/optimizationsBreakdown/optimizationsBreakdown.styles.ts index 696df518c..62350d5be 100644 --- a/src/routes/optimizations/optimizationsBreakdown/optimizationsBreakdown.styles.ts +++ b/src/routes/optimizations/optimizationsBreakdown/optimizationsBreakdown.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -17,7 +17,7 @@ export const styles = { height: '36px', }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/optimizations/optimizationsDetails/optimizationsDetails.styles.ts b/src/routes/optimizations/optimizationsDetails/optimizationsDetails.styles.ts index bcd3af1a9..db659e423 100644 --- a/src/routes/optimizations/optimizationsDetails/optimizationsDetails.styles.ts +++ b/src/routes/optimizations/optimizationsDetails/optimizationsDetails.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,7 +7,7 @@ export const styles = { minHeight: '100vh', }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/overview/overview.styles.ts b/src/routes/overview/overview.styles.ts index 7179a46cb..e30ebf2b3 100644 --- a/src/routes/overview/overview.styles.ts +++ b/src/routes/overview/overview.styles.ts @@ -1,5 +1,5 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; -import global_FontSize_md from '@patternfly/react-tokens/dist/js/global_FontSize_md'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; +import global_font_size_md from '@patternfly/react-tokens/dist/js/global_font_size_md'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -14,7 +14,7 @@ export const styles = { marginLeft: global_spacer_md.var, }, header: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, padding: global_spacer_lg.var, }, headerContentLeft: { @@ -24,7 +24,7 @@ export const styles = { display: 'flex', }, infoIcon: { - fontSize: global_FontSize_md.value, + fontSize: global_font_size_md.value, }, infoTitle: { fontWeight: 'bold', @@ -33,7 +33,7 @@ export const styles = { padding: global_spacer_lg.value, }, tabs: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, paddingBottom: global_spacer_lg.var, paddingTop: global_spacer_lg.var, }, diff --git a/src/routes/overview/overview.tsx b/src/routes/overview/overview.tsx index 106659009..76eed7c74 100644 --- a/src/routes/overview/overview.tsx +++ b/src/routes/overview/overview.tsx @@ -773,7 +773,8 @@ class OverviewBase extends React.Component { } > - diff --git a/src/routes/settings/calculations/calculations.styles.ts b/src/routes/settings/calculations/calculations.styles.ts index 3b34f647c..d59141aa5 100644 --- a/src/routes/settings/calculations/calculations.styles.ts +++ b/src/routes/settings/calculations/calculations.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_lg from '@patternfly/react-tokens/dist/js/global_spacer_lg'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import global_spacer_sm from '@patternfly/react-tokens/dist/js/global_spacer_sm'; @@ -11,7 +11,7 @@ export const styles = { width: 'fit-content', }, costTypeContainer: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, paddingBottom: global_spacer_lg.var, paddingLeft: global_spacer_lg.var, paddingRight: global_spacer_lg.var, @@ -22,7 +22,7 @@ export const styles = { width: 'fit-content', }, currencyContainer: { - backgroundColor: global_BackgroundColor_light_100.var, + backgroundColor: global_background_color_100.var, paddingBottom: global_spacer_lg.var, paddingLeft: global_spacer_lg.var, paddingRight: global_spacer_lg.var, diff --git a/src/routes/settings/costCategory/costCategory.styles.ts b/src/routes/settings/costCategory/costCategory.styles.ts index 19d3215ba..e1a9969c2 100644 --- a/src/routes/settings/costCategory/costCategory.styles.ts +++ b/src/routes/settings/costCategory/costCategory.styles.ts @@ -1,4 +1,4 @@ -import global_BackgroundColor_light_100 from '@patternfly/react-tokens/dist/js/global_BackgroundColor_light_100'; +import global_background_color_100 from '@patternfly/react-tokens/dist/js/global_background_color_100'; import global_spacer_md from '@patternfly/react-tokens/dist/js/global_spacer_md'; import type React from 'react'; @@ -7,13 +7,13 @@ export const styles = { marginLeft: global_spacer_md.var, }, descContainer: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingLeft: global_spacer_md.value, paddingRight: global_spacer_md.value, paddingTop: global_spacer_md.value, }, pagination: { - backgroundColor: global_BackgroundColor_light_100.value, + backgroundColor: global_background_color_100.value, paddingBottom: global_spacer_md.value, paddingTop: global_spacer_md.value, }, diff --git a/src/routes/settings/costModels/components/addPriceList.tsx b/src/routes/settings/costModels/components/addPriceList.tsx index a5952344c..fc287a3dd 100644 --- a/src/routes/settings/costModels/components/addPriceList.tsx +++ b/src/routes/settings/costModels/components/addPriceList.tsx @@ -2,11 +2,11 @@ import { ActionGroup, Button, ButtonVariant, + Content, + ContentVariants, Form, Stack, StackItem, - Content, - ContentVariants, Title, TitleSizes, } from '@patternfly/react-core'; @@ -48,7 +48,9 @@ const AddPriceList: React.FC = ({ - {intl.formatMessage(messages.costModelsWizardPriceListMetric)} + + {intl.formatMessage(messages.costModelsWizardPriceListMetric)} + diff --git a/src/routes/settings/costModels/components/errorState.tsx b/src/routes/settings/costModels/components/errorState.tsx index 0d8938c3e..073fe459c 100644 --- a/src/routes/settings/costModels/components/errorState.tsx +++ b/src/routes/settings/costModels/components/errorState.tsx @@ -11,7 +11,6 @@ import { TitleSizes, } from '@patternfly/react-core'; import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; - import messages from 'locales/messages'; import React from 'react'; import type { WrappedComponentProps } from 'react-intl'; @@ -30,7 +29,7 @@ type ErrorStateProps = ErrorEmptyProps & OwnProps; export const ErrorState: React.FC = ({ variant, actionButton, title, description }) => { return ( - + {description} diff --git a/src/routes/settings/costModels/components/inputs/rateInput.styles.ts b/src/routes/settings/costModels/components/inputs/rateInput.styles.ts index 8cb06777c..a87b28f88 100644 --- a/src/routes/settings/costModels/components/inputs/rateInput.styles.ts +++ b/src/routes/settings/costModels/components/inputs/rateInput.styles.ts @@ -1,8 +1,8 @@ -import global_FontWeight_bold from '@patternfly/react-tokens/dist/js/global_FontWeight_bold'; +import global_font_weight_body_bold_legacy from '@patternfly/react-tokens/dist/js/global_font_weight_body_bold_legacy'; import type React from 'react'; export const styles = { currency: { - fontWeight: global_FontWeight_bold.value as any, + fontWeight: global_font_weight_body_bold_legacy.value as any, }, } as { [className: string]: React.CSSProperties }; diff --git a/src/routes/settings/costModels/components/rateForm/rateForm.tsx b/src/routes/settings/costModels/components/rateForm/rateForm.tsx index 35e8e6446..6a1c883ee 100644 --- a/src/routes/settings/costModels/components/rateForm/rateForm.tsx +++ b/src/routes/settings/costModels/components/rateForm/rateForm.tsx @@ -227,7 +227,7 @@ const RateFormBase: React.FC = ({ currencyUnits, intl = defaultIn updateTag={updateTag} /> )} diff --git a/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx index 7950b96cd..e411fad5b 100644 --- a/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx +++ b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx @@ -90,7 +90,8 @@ const TaggingRatesFormBase: React.FC = ({  }> -