From 9aaa88d686396d992d06f07f7f44cee5ef046399 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Thu, 18 Jul 2019 09:55:08 +0200
Subject: [PATCH] SONAR-11714 Don't use badges for analysis version events

---
 .../src/main/js/app/styles/components/ui.css     | 16 ++++++++++++++++
 .../src/main/js/apps/overview/events/Event.tsx   |  2 +-
 .../__tests__/__snapshots__/Event-test.tsx.snap  |  2 +-
 .../components/ProjectActivityAnalysesList.tsx   |  2 +-
 .../ProjectActivityAnalysesList-test.tsx.snap    |  8 ++++----
 .../components/projectActivity.css               |  5 +----
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/styles/components/ui.css b/server/sonar-web/src/main/js/app/styles/components/ui.css
index c79ecbb4439..03be11a0d01 100644
--- a/server/sonar-web/src/main/js/app/styles/components/ui.css
+++ b/server/sonar-web/src/main/js/app/styles/components/ui.css
@@ -65,3 +65,19 @@
   font-size: var(--smallFontSize);
   color: #fff;
 }
+
+.analysis-version {
+  display: inline-block;
+  vertical-align: middle;
+  height: 20px;
+  padding: 0 8px;
+  background-color: var(--blue);
+  border-radius: 2px;
+  line-height: 20px;
+  font-size: var(--smallFontSize);
+  color: var(--sonarcloudBlack100);
+  white-space: nowrap;
+  text-align: center;
+  font-weight: bold;
+  letter-spacing: 0;
+}
diff --git a/server/sonar-web/src/main/js/apps/overview/events/Event.tsx b/server/sonar-web/src/main/js/apps/overview/events/Event.tsx
index de75239dd8d..929a897098b 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/Event.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/events/Event.tsx
@@ -32,7 +32,7 @@ export default function Event({ event }: Props) {
   if (event.category === 'VERSION') {
     return (
       <span
-        className="overview-analysis-event badge"
+        className="overview-analysis-event analysis-version"
         title={`${translate('version')} ${event.name}`}>
         {event.name}
       </span>
diff --git a/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Event-test.tsx.snap b/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Event-test.tsx.snap
index eb026e1a3e7..56508dbaede 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Event-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Event-test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`should render a version correctly 1`] = `
 <span
-  className="overview-analysis-event badge"
+  className="overview-analysis-event analysis-version"
   title="version 6.5-SNAPSHOT"
 >
   6.5-SNAPSHOT
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
index 88215bd42c5..19a8c041be4 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
@@ -197,7 +197,7 @@ export default class ProjectActivityAnalysesList extends React.PureComponent<Pro
                   <Tooltip
                     mouseEnterDelay={0.5}
                     overlay={`${translate('version')} ${version.version}`}>
-                    <span className="badge">{version.version}</span>
+                    <span className="analysis-version">{version.version}</span>
                   </Tooltip>
                 </div>
               )}
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.tsx.snap
index ea9891dd7d0..801e98e8a31 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.tsx.snap
@@ -21,7 +21,7 @@ exports[`should correctly filter analyses by category 1`] = `
         overlay="version 6.4"
       >
         <span
-          className="badge"
+          className="analysis-version"
         >
           6.4
         </span>
@@ -100,7 +100,7 @@ exports[`should correctly filter analyses by date range 1`] = `
         overlay="version 6.5-SNAPSHOT"
       >
         <span
-          className="badge"
+          className="analysis-version"
         >
           6.5-SNAPSHOT
         </span>
@@ -179,7 +179,7 @@ exports[`should render correctly 1`] = `
         overlay="version 6.5-SNAPSHOT"
       >
         <span
-          className="badge"
+          className="analysis-version"
         >
           6.5-SNAPSHOT
         </span>
@@ -265,7 +265,7 @@ exports[`should render correctly 1`] = `
         overlay="version 6.4"
       >
         <span
-          className="badge"
+          className="analysis-version"
         >
           6.4
         </span>
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css b/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css
index e0c84d62473..acb32386265 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/projectActivity.css
@@ -215,12 +215,9 @@
   padding-top: 36px;
 }
 
-.project-activity-version-badge .badge {
+.project-activity-version-badge .analysis-version {
   max-width: 385px;
   border-radius: 0 2px 2px 0;
-  font-weight: bold;
-  font-size: var(--smallFontSize);
-  letter-spacing: 0;
   overflow: hidden;
   text-overflow: ellipsis;
 }
-- 
2.39.5