From 3e80609e13dcade89cb718eadf7e7361230c1272 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 22 Aug 2023 15:04:42 +0200
Subject: [PATCH] SONAR-20023 Small UI fixes

---
 .../design-system/src/components/input/InputSelect.tsx        | 2 +-
 .../src/main/js/components/issue/components/IssueSeverity.tsx | 2 +-
 .../main/js/components/issue/components/IssueTransition.tsx   | 4 +++-
 .../src/main/js/components/issue/components/IssueType.tsx     | 2 +-
 sonar-core/src/main/resources/org/sonar/l10n/core.properties  | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/design-system/src/components/input/InputSelect.tsx b/server/sonar-web/design-system/src/components/input/InputSelect.tsx
index 586ae032180..6f2c6fb277e 100644
--- a/server/sonar-web/design-system/src/components/input/InputSelect.tsx
+++ b/server/sonar-web/design-system/src/components/input/InputSelect.tsx
@@ -100,7 +100,7 @@ function IndicatorsContainer<
 >(props: OptionProps<Option, IsMulti, Group>) {
   return (
     <components.IndicatorsContainer {...props}>
-      <div className="sw-pr-2">
+      <div className="sw-pr-2 sw-flex">
         <ChevronDownIcon />
       </div>
     </components.IndicatorsContainer>
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx
index c1b0755e2e4..fc19dcb78bb 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx
@@ -42,7 +42,7 @@ export default function IssueSeverity({ issue }: Props) {
         },
       ]}
     >
-      <DisabledText className="sw-flex sw-items-center sw-gap-1 sw-cursor-not-allowed">
+      <DisabledText className="sw-flex sw-items-center sw-gap-1">
         <IssueSeverityIcon
           fill="iconSeverityDisabled"
           severity={issue.severity as IssueSeverityType}
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx
index 338b5a6c344..5336602d2ac 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx
@@ -99,7 +99,9 @@ export default class IssueTransition extends React.PureComponent<Props> {
           onMenuClose={this.handleClose}
           onMenuOpen={() => this.toggleSetTransition(true)}
           value={issue.resolution ?? 'OPEN'}
-          customValue={<StatusHelper resolution={issue.resolution} status={issue.status} />}
+          customValue={
+            <StatusHelper className="sw-flex" resolution={issue.resolution} status={issue.status} />
+          }
         />
       );
     }
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx
index 37406bc8bde..91206aa53ae 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx
@@ -41,7 +41,7 @@ export default function IssueType({ issue }: Props) {
         },
       ]}
     >
-      <DisabledText className="sw-flex sw-items-center sw-gap-1 sw-cursor-not-allowed">
+      <DisabledText className="sw-flex sw-items-center sw-gap-1">
         <IssueTypeIcon fill="iconTypeDisabled" type={issue.type} aria-hidden />
         {translate('issue.type', issue.type)}
       </DisabledText>
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 113a731445c..8680995447c 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -993,7 +993,7 @@ issue.clean_code_attribute_category.INTENTIONAL.advice=To be intentional, the co
 issue.clean_code_attribute_category.INTENTIONAL.title_short=Intentionality issue
 issue.clean_code_attribute_category.ADAPTABLE=Adaptability
 issue.clean_code_attribute_category.ADAPTABLE.title=This is an adaptability issue.
-issue.clean_code_attribute_category.ADAPTABLE.advice=To be adaptable, code needs to be structured to be easy to evolve with confidence.
+issue.clean_code_attribute_category.ADAPTABLE.advice=To be adaptable, the code needs to be structured to be easy to evolve and develop with confidence.
 issue.clean_code_attribute_category.ADAPTABLE.title_short=Adaptability issue
 issue.clean_code_attribute_category.RESPONSIBLE=Responsibility
 issue.clean_code_attribute_category.RESPONSIBLE.title=This is a responsibility issue.
@@ -1012,7 +1012,7 @@ issue.clean_code_attribute.CONVENTIONAL.title=This is a consistency issue, the c
 issue.clean_code_attribute.CONVENTIONAL.advice=To be conventional, the code needs to perform tasks with expected instructions, and adhere to a single choice across all instances when faced with equally good options.
 issue.clean_code_attribute.DISTINCT=Not distinct
 issue.clean_code_attribute.DISTINCT.title=This is an adaptability issue, the code is not distinct enough.
-issue.clean_code_attribute.DISTINCT.advice=To be distinct, the code needs to have procedures and data that are unique and distinctive, without undue duplication.
+issue.clean_code_attribute.DISTINCT.advice=To be distinct, the code needs to have procedures and data that are unique and distinctive, without unnecessary duplication.
 issue.clean_code_attribute.EFFICIENT=Not efficient
 issue.clean_code_attribute.EFFICIENT.title=This is an intentionality issue, the code is not efficient enough.
 issue.clean_code_attribute.EFFICIENT.advice=To be efficient, the code needs to use resources without needless waste, and prioritize economical options when available.
-- 
2.39.5