From: Wouter Admiraal Date: Wed, 24 Aug 2022 15:40:37 +0000 (+0200) Subject: SONAR-16725 [891882] An icon lacks 3 to 1 contrast ratio X-Git-Tag: 9.7.0.61563~311 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c757692a0a8d02998bfd8839c2612e17011013a7;p=sonarqube.git SONAR-16725 [891882] An icon lacks 3 to 1 contrast ratio --- diff --git a/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx b/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx index d00315089d1..c9cc789ec05 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx @@ -25,6 +25,7 @@ import { isMainBranch } from '../../../../helpers/branch-like'; import { getComponentOverviewUrl } from '../../../../helpers/urls'; import { BranchLike } from '../../../../types/branch-like'; import { Component } from '../../../../types/types'; +import { colors } from '../../../theme'; export interface BreadcrumbProps { component: Component; @@ -37,32 +38,62 @@ export function Breadcrumb(props: BreadcrumbProps) { currentBranchLike } = props; const lastBreadcrumbElement = last(breadcrumbs); - const isNoMainBranch = currentBranchLike && !isMainBranch(currentBranchLike); + const isNotMainBranch = currentBranchLike && !isMainBranch(currentBranchLike); return (
{breadcrumbs.map((breadcrumbElement, i) => { const isFirst = i === 0; const isNotLast = i < breadcrumbs.length - 1; + const isLast = !isNotLast; + const showQualifierIcon = isFirst && lastBreadcrumbElement; + + const name = + isNotMainBranch || isNotLast ? ( + <> + {showQualifierIcon && !isNotMainBranch && ( + + )} + + {showQualifierIcon && isNotMainBranch && ( + + )} + {breadcrumbElement.name} + + + ) : ( + <> + {showQualifierIcon && ( + + )} + {breadcrumbElement.name} + + ); return ( - {isFirst && lastBreadcrumbElement && ( - - )} - {isNoMainBranch || isNotLast ? ( -

- - {breadcrumbElement.name} - -

- ) : ( + {isLast ? (

- {breadcrumbElement.name} + {name}

+ ) : ( + + {name} + )} {isNotLast && } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx index f57d6b934a7..5e8149cae12 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx @@ -54,6 +54,7 @@ export interface ComponentNavProps { } const ALERT_HEIGHT = 30; +const BRANCHLIKE_TOGGLE_ADDED_HEIGHT = 6; export default function ComponentNav(props: ComponentNavProps) { const { @@ -109,6 +110,10 @@ export default function ComponentNav(props: ComponentNavProps) { contextNavHeight += ALERT_HEIGHT; } + if (branchLikes.length) { + contextNavHeight += BRANCHLIKE_TOGGLE_ADDED_HEIGHT; + } + return ( setDisplayProjectInfo(false)} - top={globalNavHeightRaw + contextNavHeightRaw}> + top={globalNavHeightRaw + contextNavHeight}> -
+
{isLoggedIn(currentUser) && ( )} -
+
); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.css b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.css index 0e5e2a46fda..d129c91bdea 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.css +++ b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.css @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ .header-meta-warnings .alert { - margin-bottom: 0; + margin-bottom: 5px; } .header-meta-warnings .alert-content { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/Breadcrumb-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/Breadcrumb-test.tsx index 4d67b48719c..58372411efb 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/Breadcrumb-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/Breadcrumb-test.tsx @@ -32,8 +32,21 @@ it('should render correctly', () => { }); it('should render correctly when not on a main branch', () => { - renderBreadcrumb({ currentBranchLike: mockBranch() }); - expect(screen.getByRole('link', { name: 'Child portfolio' })).toBeInTheDocument(); + renderBreadcrumb({ + component: mockComponent({ + breadcrumbs: [ + { + key: 'project', + name: 'My Project', + qualifier: ComponentQualifier.Project + } + ] + }), + currentBranchLike: mockBranch() + }); + expect( + screen.getByRole('link', { name: `qualifier.${ComponentQualifier.Project} My Project` }) + ).toBeInTheDocument(); }); function renderBreadcrumb(props: Partial = {}) { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/Header-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/Header-test.tsx.snap index c3f9e27795d..b64a5de4964 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/Header-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/Header-test.tsx.snap @@ -8,7 +8,7 @@ exports[`should render correctly 1`] = ` prioritizeSeoTags={false} title="MyProject" /> -
-
+ `; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.css b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.css index 26307f605d1..d70e4bb83db 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.css +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.css @@ -17,6 +17,26 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +.branch-like-navigation-toggler { + padding: 4px 8px; + border: 1px solid transparent; + border-radius: 2px; +} + +.branch-like-navigation-toggler:hover { + border-color: var(--black38); + color: inherit !important; +} + +.branch-like-navigation-toggler:active, +.branch-like-navigation-toggler.open { + border-color: var(--primary); +} + +.branch-like-navigation-toggler-container { + height: 26px; +} + .branch-like-navigation-toggler-container .popup { min-width: 430px; max-width: 650px; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx index 3688efac0b2..d0bee5e91f1 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx @@ -19,6 +19,7 @@ */ import classNames from 'classnames'; import * as React from 'react'; +import { ButtonPlain } from '../../../../../components/controls/buttons'; import Toggler from '../../../../../components/controls/Toggler'; import { ProjectAlmBindingResponse } from '../../../../../types/alm-settings'; import { AppState } from '../../../../../types/appstate'; @@ -65,9 +66,12 @@ export function BranchLikeNavigation(props: BranchLikeNavigationProps) { return ( + className={classNames( + 'big-spacer-left flex-0 branch-like-navigation-toggler-container display-flex-center', + { + dropdown: isMenuEnabled + } + )}> {isMenuEnabled ? ( setIsMenuOpen(false)} @@ -81,12 +85,13 @@ export function BranchLikeNavigation(props: BranchLikeNavigationProps) { onClose={() => setIsMenuOpen(false)} /> }> - setIsMenuOpen(!isMenuOpen)}> + setIsMenuOpen(!isMenuOpen)} + aria-expanded={isMenuOpen} + aria-haspopup="menu"> {currentBranchLikeElement} - + ) : ( currentBranchLikeElement diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx index 32ec2231bf3..79a6ec109df 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx @@ -57,12 +57,12 @@ export function CurrentBranchLike(props: CurrentBranchLikeProps) { const isGitLab = projectBinding !== undefined && projectBinding.alm === AlmKeys.GitLab; const additionalIcon = () => { - const plusIcon = ; - if (branchesEnabled && hasManyBranches) { return ; } + const plusIcon = ; + if (isApplication) { if (!hasManyBranches && canAdminComponent) { return ( @@ -144,7 +144,7 @@ export function CurrentBranchLike(props: CurrentBranchLikeProps) { return ( - + diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx index c98569e90a8..4be90c8c544 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx @@ -19,6 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; +import { ButtonPlain } from '../../../../../../components/controls/buttons'; import Toggler from '../../../../../../components/controls/Toggler'; import { mockSetOfBranchAndPullRequest } from '../../../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../../../helpers/mocks/component'; @@ -40,10 +41,10 @@ it('should properly toggle menu opening when clicking the anchor', () => { const wrapper = shallowRender({ appState: mockAppState({ branchesEnabled: true }) }); expect(wrapper.find(Toggler).props().open).toBe(false); - click(wrapper.find('a')); + click(wrapper.find(ButtonPlain)); expect(wrapper.find(Toggler).props().open).toBe(true); - click(wrapper.find('a')); + click(wrapper.find(ButtonPlain)); expect(wrapper.find(Toggler).props().open).toBe(false); }); @@ -51,7 +52,7 @@ it('should properly close menu when toggler asks for', () => { const wrapper = shallowRender({ appState: mockAppState({ branchesEnabled: true }) }); expect(wrapper.find(Toggler).props().open).toBe(false); - click(wrapper.find('a')); + click(wrapper.find(ButtonPlain)); expect(wrapper.find(Toggler).props().open).toBe(true); wrapper diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/BranchLikeNavigation-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/BranchLikeNavigation-test.tsx.snap index 9a956e3303c..d70c3604f56 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/BranchLikeNavigation-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/BranchLikeNavigation-test.tsx.snap @@ -2,7 +2,7 @@ exports[`should render correctly 1`] = ` } > - - + `; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap index e45e2c250b4..03c55f4adfc 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap @@ -13,6 +13,7 @@ exports[`applications should render correctly when there are many branchlikes 1` "name": "master", } } + fill="#0271B9" /> @@ -110,6 +113,7 @@ exports[`projects should render correctly when branches support is disabled: alm "name": "master", } } + fill="#0271B9" /> @@ -151,6 +155,7 @@ exports[`projects should render correctly when branches support is disabled: alm "name": "master", } } + fill="#0271B9" /> @@ -192,6 +197,7 @@ exports[`projects should render correctly when branches support is disabled: def "name": "master", } } + fill="#0271B9" /> @@ -233,6 +239,7 @@ exports[`projects should render correctly when there are many branchlikes 1`] = "name": "master", } } + fill="#0271B9" /> diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx index 389d2d72bea..651a748a5e2 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx @@ -56,7 +56,7 @@ export default class MetaLink extends React.PureComponent { return (
  • { static defaultProps = { extensions: [] @@ -249,12 +251,12 @@ export class SettingsNav extends React.PureComponent { return ( -
    +

    {translate('layout.settings')}

    -
    + {this.renderConfigurationTab()} diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.tsx.snap index 029675a85cb..383948b261d 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.tsx.snap @@ -29,13 +29,13 @@ exports[`should render correctly when governance is active 1`] = ` height={72} id="context-navigation" > -

    layout.settings

    -
    + -

    layout.settings

    -
    + span:last-child { - border-bottom: 1px solid var(--lightBlue); -} - -.link-checkbox { - color: inherit; - border-bottom: none; -} - -.link-checkbox.disabled, -.link-checkbox.disabled:hover, -.link-checkbox.disabled label { - color: var(--secondFontColor); - cursor: not-allowed; -} - -.link-checkbox:hover, -.link-checkbox:active, -.link-checkbox:focus { - color: inherit; -} - -.link-checkbox-control { - display: inline-block; - padding: 4px 0 5px; - line-height: 16px; -} - -a.active-link, -.link-active { - border-bottom: none; - cursor: default; -} - -a.text-muted { - border-bottom: 1px solid #dddddd; - color: var(--secondFontColor); -} - -a.text-muted:hover, -a.text-muted:active, -a.text-muted:focus { - color: #5e5e5e; -} - -a.text-muted:focus { - outline: 1px dotted var(--blue); + border-bottom-color: transparent !important; } -a.set-homepage-link:focus, -a.favorite-link:focus { - outline: 1px dotted var(--blue); +.link-no-underline:hover { + border-bottom-color: var(--primary) !important; } diff --git a/server/sonar-web/src/main/js/app/theme.js b/server/sonar-web/src/main/js/app/theme.js index 2dd5ec2747e..9a73cecbd3b 100644 --- a/server/sonar-web/src/main/js/app/theme.js +++ b/server/sonar-web/src/main/js/app/theme.js @@ -136,10 +136,23 @@ module.exports = { codeAdded: '#dff0d8', codeRemoved: '#f2dede', - //promotion + // promotion darkBackground: '#292929', darkBackgroundSeparator: '#413b3b', - darkBackgroundFontColor: '#f6f8fa' + darkBackgroundFontColor: '#f6f8fa', + + // new color palette + // some of these colors duplicate what we have above, but this will make it + // easier to align with the UX designers on what colors to use where. + primary: '#236a97', + primary40: 'rgba(35, 107, 151, 0.4)', + + info500: '#0271B9', + + neutral600: '#666666', + neutral800: '#333333', + + black38: 'rgba(0, 0, 0, 0.38)' }, sizes: { diff --git a/server/sonar-web/src/main/js/apps/code/code.css b/server/sonar-web/src/main/js/apps/code/code.css index 7588b745ab2..739ec197e88 100644 --- a/server/sonar-web/src/main/js/apps/code/code.css +++ b/server/sonar-web/src/main/js/apps/code/code.css @@ -36,6 +36,7 @@ .code-breadcrumbs > li { padding: 5px 5px 3px; + display: flex; } .code-breadcrumbs > li:first-child { @@ -44,7 +45,7 @@ .code-breadcrumbs > li::after { position: relative; - top: -1px; + top: 1px; padding-left: 10px; color: var(--secondFontColor); font-size: 11px; diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx index 6c96b8a34cf..a22e7b7989a 100644 --- a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx @@ -132,16 +132,19 @@ function renderNameWithIcon( : undefined; return ( - {name} + + {name} ); } else if (canBrowse) { @@ -150,14 +153,27 @@ function renderNameWithIcon( Object.assign(query, { selected: component.key }); } return ( - - {name} + + + {name} ); } return ( - {name} + {' '} + {name} ); } diff --git a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/ComponentName-test.tsx.snap b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/ComponentName-test.tsx.snap index e54bcc69a92..0160ee7d449 100644 --- a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/ComponentName-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/ComponentName-test.tsx.snap @@ -10,6 +10,7 @@ foo" > @@ -28,6 +29,7 @@ foo" > @@ -46,6 +48,7 @@ foo" > @@ -64,6 +67,7 @@ foo" > @@ -82,6 +86,7 @@ foo" > @@ -99,6 +104,7 @@ foo" > @@ -129,6 +135,7 @@ foo" > @@ -146,6 +153,7 @@ foo:src/index.tsx" > @@ -162,7 +170,7 @@ exports[`#ComponentName should render correctly for files 2`] = ` foo:src/index.tsx" > - index.tsx @@ -190,6 +199,7 @@ foo:src/index.tsx" > @@ -207,6 +217,7 @@ foo:src/index.tsx" > @@ -224,6 +235,7 @@ foo:src/index.tsx" > @@ -241,6 +253,7 @@ foo:src/index.tsx" > @@ -258,6 +271,7 @@ foo:src/index.tsx" > @@ -276,7 +290,7 @@ foo foo" > - Foo @@ -308,7 +323,7 @@ foo foo" > - Foo @@ -351,7 +367,7 @@ exports[`#ComponentName should render correctly for refs 3`] = ` foo" > - Foo diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx index e0ed6fe2146..5d8a86d738a 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx @@ -73,7 +73,7 @@ export default class RuleDetailsProfiles extends React.PureComponent { {(activation.inherit === 'OVERRIDES' || activation.inherit === 'INHERITED') && ( <> - + {profile.parentName} diff --git a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx index a6350387a22..67ba28ef4aa 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx @@ -73,7 +73,7 @@ export default function AzurePersonalAccessTokenForm(props: AzurePersonalAccessT values={{ link: url ? (     diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx index b1c05705ec8..4bd638587d0 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx @@ -119,9 +119,7 @@ export default function BitbucketProjectAccordion(props: BitbucketProjectAccordi className={classNames( 'display-flex-start spacer-right spacer-bottom create-project-import-bbs-repo overflow-hidden', { - disabled: disableRepositories, - 'text-muted': disableRepositories, - 'link-no-underline': disableRepositories + disabled: disableRepositories } )} key={repo.id} diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/AzurePersonalAccessTokenForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/AzurePersonalAccessTokenForm-test.tsx.snap index c8399e96c85..685eb640c7e 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/AzurePersonalAccessTokenForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/AzurePersonalAccessTokenForm-test.tsx.snap @@ -19,7 +19,7 @@ exports[`should render correctly: default 1`] = ` values={ Object { "link": {linkToProject ? ( {projectNameLabel} diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/__snapshots__/IssueSourceViewerHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/__snapshots__/IssueSourceViewerHeader-test.tsx.snap index e571d0d0e36..db4633e9607 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/__snapshots__/IssueSourceViewerHeader-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/__snapshots__/IssueSourceViewerHeader-test.tsx.snap @@ -13,7 +13,7 @@ exports[`should render correctly 1`] = ` className="spacer-right" >
    - - {translate('permission_templates.page')} - + {translate('permission_templates.page')}

    {template.name}

    diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx index 1cb7d26e0ba..5178b23c919 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx @@ -53,7 +53,7 @@ export default class ProjectRow extends React.PureComponent { diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/__snapshots__/ProjectRow-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/__snapshots__/ProjectRow-test.tsx.snap index 69db1456cc3..19273a75709 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/__snapshots__/ProjectRow-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/__snapshots__/ProjectRow-test.tsx.snap @@ -17,7 +17,7 @@ exports[`renders 1`] = ` className="nowrap hide-overflow project-row-text-cell" >
    - + {translate('quality_profiles.page')}
    diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx index 1d4b6ed5d4b..5e147feec6b 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx @@ -38,19 +38,17 @@ export default class ProfileHeader extends React.PureComponent { const { profile } = this.props; return ( -
    +
    - + {translate('quality_profiles.page')} {' / '} - - {profile.languageName} - + {profile.languageName}

    - + {profile.name} {profile.isDefault && ( @@ -91,7 +89,7 @@ export default class ProfileHeader extends React.PureComponent { {translate('quality_profiles.built_in.description')}

    )} -
    + ); } } diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx index 0dcc970ab01..a5ad08c1fb6 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx @@ -147,7 +147,7 @@ export default class ProfileProjects extends React.PureComponent {
      {projects.map(project => (
    • - + {project.name}
      • diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx index 2243f339ffe..3f813408c04 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx @@ -63,11 +63,11 @@ export default function ProfileRulesRowOfType(props: Props) { {inactiveCount != null && (inactiveCount > 0 ? ( - + {formatMeasure(inactiveCount, 'SHORT_INT', null)} ) : ( - 0 + 0 ))} diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx index 45bd13b3f6c..62156642237 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx @@ -52,11 +52,11 @@ export default function ProfileRulesRowTotal(props: Props) { {inactiveCount != null && (inactiveCount > 0 ? ( - + {formatMeasure(inactiveCount, 'SHORT_INT', null)} ) : ( - 0 + 0 ))} diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileHeader-test.tsx.snap index db6386f4230..8b99596ac38 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileHeader-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileHeader-test.tsx.snap @@ -1,14 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should render correctly 1`] = ` -
      @@ -16,7 +15,6 @@ exports[`should render correctly 1`] = ` / @@ -102,18 +99,17 @@ exports[`should render correctly 1`] = `
    - + `; exports[`should render correctly: for default profile 1`] = ` -
    @@ -121,7 +117,6 @@ exports[`should render correctly: for default profile 1`] = ` / @@ -216,5 +210,5 @@ exports[`should render correctly: for default profile 1`] = `
    • - + `; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileProjects-test.tsx.snap b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileProjects-test.tsx.snap index f7310b99075..cfb7b753c46 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileProjects-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileProjects-test.tsx.snap @@ -36,7 +36,6 @@ exports[`should render correctly: default 1`] = ` key="org.sonarsource.xml:xml" > 0 diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileRulesRowTotal-test.tsx.snap b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileRulesRowTotal-test.tsx.snap index 5e18680e3b4..695b3fbe044 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileRulesRowTotal-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/__snapshots__/ProfileRulesRowTotal-test.tsx.snap @@ -27,7 +27,7 @@ exports[`should render correctly 1`] = ` className="thin nowrap text-right" > 0 diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx index 18a7b1f33e3..3c7ce567769 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx @@ -119,11 +119,8 @@ export default class EvolutionDeprecated extends React.PureComponent {