diff options
Diffstat (limited to 'server/sonar-web/src')
11 files changed, 19 insertions, 36 deletions
diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx index cf98fb64906..6636295d126 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx +++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx @@ -20,13 +20,7 @@ import styled from '@emotion/styled'; import { LinkHighlight, LinkStandalone } from '@sonarsource/echoes-react'; -import { - FlagMessage, - LAYOUT_VIEWPORT_MIN_WIDTH, - PageContentFontWrapper, - themeBorder, - themeColor, -} from 'design-system'; +import { FlagMessage, LAYOUT_VIEWPORT_MIN_WIDTH, themeBorder, themeColor } from 'design-system'; import React from 'react'; import { useIntl } from 'react-intl'; import InstanceMessage from '../../components/common/InstanceMessage'; @@ -50,7 +44,7 @@ export default function GlobalFooter({ hideLoggedInInfo }: Readonly<GlobalFooter return ( <StyledFooter className="sw-p-6" id="footer"> - <PageContentFontWrapper className="sw-typo-default sw-h-full sw-flex sw-flex-col sw-items-stretch"> + <div className="sw-typo-default sw-h-full sw-flex sw-flex-col sw-items-stretch"> {appState?.productionDatabase === false && ( <FlagMessage className="sw-mb-4" id="evaluation_warning" variant="warning"> <p> @@ -121,12 +115,13 @@ export default function GlobalFooter({ hideLoggedInInfo }: Readonly<GlobalFooter )} </ul> </div> - </PageContentFontWrapper> + </div> </StyledFooter> ); } const StyledFooter = styled.div` + color: var(--echoes-color-text-subdued); background-color: ${themeColor('backgroundSecondary')}; border-top: ${themeBorder('default')}; box-sizing: border-box; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChartView.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChartView.tsx index a2b6b3d4596..23d50b687ad 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChartView.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChartView.tsx @@ -297,7 +297,7 @@ const getTooltip = ( }; const BubbleChartWrapper = styled.div` - color: ${themeColor('pageContentLight')}; + color: var(--echoes-color-text-subdued); `; const YAxis = styled.div` diff --git a/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx b/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx index 2fd9f000a79..52fd0c40ce8 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import styled from '@emotion/styled'; -import { Badge, BranchIcon, themeBorder, themeContrast } from 'design-system'; +import { Badge, BranchIcon, themeBorder } from 'design-system'; import * as React from 'react'; import { ComponentQualifier } from '~sonar-aligned/types/component'; import { translate, translateWithParameters } from '../../../helpers/l10n'; @@ -88,7 +88,7 @@ export default function ComponentBreadcrumbs({ } const DivStyled = styled.div` - color: ${themeContrast('breadcrumb')}; + color: var(--echoes-color-text-subdued); &:not(:last-child) { border-bottom: ${themeBorder('default')}; } diff --git a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/IssueLocationsCrossFile.tsx b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/IssueLocationsCrossFile.tsx index a9f6ddb40d5..8ac33d714d0 100644 --- a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/IssueLocationsCrossFile.tsx +++ b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/IssueLocationsCrossFile.tsx @@ -199,6 +199,6 @@ const ComponentName = styled.div` `; const ExpandButton = styled(BareButton)` - color: ${themeContrast('subnavigationSubheading')}; + color: var(--echoes-color-text-subdued); border-bottom: ${themeBorder('default', 'currentColor')}; `; diff --git a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssue.tsx b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssue.tsx index a3f5c1f9de8..a6be2eef8bf 100644 --- a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssue.tsx +++ b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssue.tsx @@ -84,7 +84,7 @@ export default function SubnavigationIssue(props: ConciseIssueProps) { } const IssueInfo = styled.div` - color: ${themeContrast('pageContentLight')}; + color: var(--echoes-color-text-subdued); .active &, :hover & { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx index 2196eb6b01f..5a5f401526d 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx @@ -18,13 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import styled from '@emotion/styled'; -import { - BareButton, - ExecutionFlowIcon, - SubnavigationItem, - themeColor, - themeContrast, -} from 'design-system'; +import { BareButton, ExecutionFlowIcon, SubnavigationItem, themeColor } from 'design-system'; import React, { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; import SingleFileLocationNavigator from '../../../components/locations/SingleFileLocationNavigator'; @@ -122,7 +116,7 @@ const StyledHotspotTitle = styled(BareButton)` `; const StyledHotspotInfo = styled.div` - color: ${themeContrast('pageContentLight')}; + color: var(--echoes-color-text-subdued); `; const StyledSeparator = styled.div` diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx index e7b2b5f0f6c..f940641a50c 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx @@ -112,7 +112,7 @@ export class GraphsTooltipsClass extends React.PureComponent<Props> { <Table columnCount={COLUMNS} noHeaderTopBorder - style={{ color: themeColor('dropdownMenuSubTitle')({ theme }) }} + style={{ color: 'var(--echoes-color-text-subdued)' }} > {addSeparator && <TableSeparator />} {events?.length > 0 && ( diff --git a/server/sonar-web/src/main/js/components/controls/ListFooter.tsx b/server/sonar-web/src/main/js/components/controls/ListFooter.tsx index 4439c0b6d6e..92ee6ea37cd 100644 --- a/server/sonar-web/src/main/js/components/controls/ListFooter.tsx +++ b/server/sonar-web/src/main/js/components/controls/ListFooter.tsx @@ -20,7 +20,7 @@ import styled from '@emotion/styled'; import { Button } from '@sonarsource/echoes-react'; import classNames from 'classnames'; -import { Spinner, themeColor } from 'design-system'; +import { Spinner } from 'design-system'; import * as React from 'react'; import { formatMeasure } from '~sonar-aligned/helpers/measures'; import { MetricType } from '~sonar-aligned/types/metrics'; @@ -124,7 +124,7 @@ export default function ListFooter(props: ListFooterProps) { } const StyledDiv = styled.div` - color: ${themeColor('pageContentLight')}; + color: var(--echoes-color-text-subdued); margin-top: 1rem /* 16px */; `; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueMetaBar.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueMetaBar.tsx index d82b792b1e8..4878fca03fb 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueMetaBar.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueMetaBar.tsx @@ -19,7 +19,7 @@ */ import styled from '@emotion/styled'; import classNames from 'classnames'; -import { Badge, CommentIcon, SeparatorCircleIcon, themeColor } from 'design-system'; +import { Badge, CommentIcon, SeparatorCircleIcon } from 'design-system'; import * as React from 'react'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { isDefined } from '../../../helpers/types'; @@ -163,5 +163,5 @@ export default function IssueMetaBar(props: Readonly<Props>) { } const IssueMetaListItem = styled.li` - color: ${themeColor('pageContentLight')}; + color: var(--echoes-color-text-subdued); `; diff --git a/server/sonar-web/src/main/js/components/new-code-definition/NewCodeDefinitionSelector.tsx b/server/sonar-web/src/main/js/components/new-code-definition/NewCodeDefinitionSelector.tsx index bf09cda52eb..ee0c157055e 100644 --- a/server/sonar-web/src/main/js/components/new-code-definition/NewCodeDefinitionSelector.tsx +++ b/server/sonar-web/src/main/js/components/new-code-definition/NewCodeDefinitionSelector.tsx @@ -18,13 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import styled from '@emotion/styled'; -import { - FlagMessage, - PageContentFontWrapper, - RadioButton, - SelectionCard, - themeColor, -} from 'design-system'; +import { FlagMessage, PageContentFontWrapper, RadioButton, SelectionCard } from 'design-system'; import { noop } from 'lodash'; import * as React from 'react'; import { getNewCodeDefinition } from '../../api/newCodeDefinition'; @@ -188,5 +182,5 @@ export default function NewCodeDefinitionSelector(props: Props) { } const StyledGlobalSettingWrapper = styled.div<{ selected: boolean }>` - color: ${({ selected }) => (selected ? 'inherit' : themeColor('selectionCardDisabledText'))}; + color: ${({ selected }) => (selected ? 'inherit' : 'var(--echoes-color-text-subdued)')}; `; diff --git a/server/sonar-web/src/main/js/components/rules/IssueSuggestionLine.tsx b/server/sonar-web/src/main/js/components/rules/IssueSuggestionLine.tsx index d2cecf9b809..6dbc7341f9f 100644 --- a/server/sonar-web/src/main/js/components/rules/IssueSuggestionLine.tsx +++ b/server/sonar-web/src/main/js/components/rules/IssueSuggestionLine.tsx @@ -101,7 +101,7 @@ export function IssueSuggestionLine({ const LineNumberStyled = styled.div` &:hover { - color: ${themeColor('codeLineMetaHover')}; + color: var(--echoes-color-text-subdued); } &:focus-visible { |