SONAR-5209 Cross project duplications

diff --git a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee
index eff49a31c8c2fc651380da247cb7cbc589b2ff8d..1f975a2619ed6fd0f33ad1cfe972884639c0851c 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee
@@ -46,5 +46,7 @@ define [
       duplications = _.map groupedBlocks, (blocks, fileRef) ->
         blocks: blocks
         file: files[fileRef]
+      duplications = _.sortBy duplications, (d) =>
+        d.file.projectName != @options.main.component.get 'projectName'
       component: @options.main.component.toJSON()
       duplications: duplications

diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index f506d0b7976a8d58674dd20074d690da7cc39c88..98498765de8784e3afa4304a94467d9917ff4ff8 100644 (file)
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -231,6 +231,8 @@
 
   .code .scm {
     line-height: 16px;
+    padding-top: 0;
+    padding-bottom: 0;
     text-align: left;
 
     .scm-date {
@@ -722,8 +724,7 @@
 }
 
 .component-viewer-popup-label {
-  padding: 0 6px;
-  background-color: @barBackgroundColor;
+  padding-right: 6px;
   font-weight: 500;
 }