From caf84aa4dd545eabd752e4d5a9ad50091e4743c2 Mon Sep 17 00:00:00 2001 From: 7PH Date: Tue, 21 Nov 2023 12:19:56 +0100 Subject: [PATCH] SONAR-20870 Apply minor UX/PM validation fixes after MMF-3441 --- .../design-system/src/components/HighlightRing.tsx | 1 + .../components/issue/components/IssueTransitionItem.tsx | 1 - .../src/main/resources/org/sonar/l10n/core.properties | 9 ++++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/sonar-web/design-system/src/components/HighlightRing.tsx b/server/sonar-web/design-system/src/components/HighlightRing.tsx index 864b5de07b7..9aff64b968d 100644 --- a/server/sonar-web/design-system/src/components/HighlightRing.tsx +++ b/server/sonar-web/design-system/src/components/HighlightRing.tsx @@ -25,6 +25,7 @@ export const HighlightRing = styled.div` &.active { box-shadow: 0 0 4px 0 ${themeColor('primary')}; background: ${themeColor('highlightRingBackground')}; + z-index: 1; ${tw`sw-rounded-1/2`} } `; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTransitionItem.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTransitionItem.tsx index 5632a884a8e..060d32f02e4 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTransitionItem.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTransitionItem.tsx @@ -47,7 +47,6 @@ export function IssueTransitionItem({ transition, selected, onSelectTransition } {translate('issue.transition.confirm.deprecated_tooltip.1')} {translate('issue.transition.confirm.deprecated_tooltip.2')} {translate('issue.transition.confirm.deprecated_tooltip.3')} - {translate('issue.transition.confirm.deprecated_tooltip.4')} ), [IssueTransition.Resolve]: ( diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 1d505aed1a7..3e1a6e07256 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -926,19 +926,18 @@ issue.transition.community_plug_link=SonarSource Community issue.transition.status_x_click_to_change=Issue status: {0}, click to change issue.transition=Transition issue.transition.accept=Accept -issue.transition.accept.description="Won't Fix now" +issue.transition.accept.description=Won't Fix now issue.transition.confirm=Confirm issue.transition.confirm.description=Deprecated issue.transition.confirm.deprecated_tooltip.1=The Confirm action is deprecated. -issue.transition.confirm.deprecated_tooltip.2=The next analysis result will show if the issue has been fixed, otherwise it will reopen it automatically. -issue.transition.confirm.deprecated_tooltip.3=If you were using Confirm to communicate with team members, consider assigning the issue or using comments and tags instead. -issue.transition.confirm.deprecated_tooltip.4=If you have reviewed this issue but cannot fix it now, consider marking it as Accepted. +issue.transition.confirm.deprecated_tooltip.2=If you were using Confirm to communicate with team members, consider assigning the issue or using comments and tags instead. +issue.transition.confirm.deprecated_tooltip.3=If you have reviewed this issue but cannot fix it now, consider marking it as Accepted. issue.transition.unconfirm=Open issue.transition.unconfirm.description=Reopen issue issue.transition.resolve=Fixed issue.transition.resolve.description=Deprecated issue.transition.resolve.deprecated_tooltip.1=The Resolve as Fixed action is deprecated. -issue.transition.resolve.deprecated_tooltip.2=The next analysis result will show if the issue has been fixed, otherwise it will reopen the issue automatically. +issue.transition.resolve.deprecated_tooltip.2=The next analysis result will show if the issue has been fixed, otherwise it will reopen it automatically. issue.transition.resolve.deprecated_tooltip.3=If you were using Resolve as Fixed to communicate with team members that an issue is being fixed, consider assigning it or using comments and tags instead. issue.transition.falsepositive=False Positive issue.transition.falsepositive.description=Analysis is mistaken -- 2.39.5