From 5484a43ba57da01aa4c080eb9b388a6cd0b359cd Mon Sep 17 00:00:00 2001
From: David Cho-Lerat <david.cho-lerat@sonarsource.com>
Date: Wed, 26 Jul 2023 12:17:26 +0200
Subject: [PATCH] SONAR-19157 Fix "after merge" text appearence

---
 .../branches/MeasuresPanelPercentMeasure.tsx     | 16 +++++++---------
 .../overview/pullRequests/AfterMergeEstimate.tsx |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentMeasure.tsx b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentMeasure.tsx
index cf7c7a1e2f1..5cf3f1055a5 100644
--- a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentMeasure.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentMeasure.tsx
@@ -126,15 +126,13 @@ export default function MeasuresPanelPercentMeasure(props: Props) {
         )}
 
         {isPullRequest(branchLike) && (
-          <>
-            <GreySeparator className="sw-mt-4" />
-            <div className="sw-body-md sw-flex sw-items-center sw-mt-4">
-              <AfterMergeEstimate measures={measures} type={type} />
-              <LightLabel className="sw-ml-2">
-                {translate('component_measures.facet_category.overall_category.estimated')}
-              </LightLabel>
-            </div>
-          </>
+          <div className="sw-body-sm sw-flex sw-items-center sw-mt-4">
+            <AfterMergeEstimate measures={measures} type={type} />
+
+            <LightLabel className="sw-ml-2">
+              {translate('component_measures.facet_category.overall_category.estimated')}
+            </LightLabel>
+          </div>
         )}
       </>
     </MeasuresPanelCard>
diff --git a/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx b/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx
index fa91067a93d..d50b13b4630 100644
--- a/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx
@@ -42,7 +42,7 @@ export function AfterMergeEstimate({ className, measures, type }: AfterMergeEsti
 
   return (
     <div className={classNames(className, 'sw-flex sw-items-center')}>
-      <LightPrimary className="sw-heading-lg">
+      <LightPrimary className="sw-body-sm-highlight">
         {formatMeasure(measure.value, MetricType.Percent)}
       </LightPrimary>
     </div>
-- 
2.39.5