summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-06-30 18:59:54 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-06-30 19:00:16 +0600
commit9f87e604ca4ffae4df25041ac3e98a081f43af23 (patch)
tree36544a660c1f0864d094e17d900e13d8d4bc4c8f
parent219681b5f2007a7ac88528ea78260c536b68e9d4 (diff)
downloadsonarqube-9f87e604ca4ffae4df25041ac3e98a081f43af23.tar.gz
sonarqube-9f87e604ca4ffae4df25041ac3e98a081f43af23.zip
SONAR-5209 Cross project duplications
-rw-r--r--sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee2
-rw-r--r--sonar-server/src/main/less/component-viewer.less5
2 files changed, 5 insertions, 2 deletions
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 eff49a31c8c..1f975a2619e 100644
--- 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 f506d0b7976..98498765de8 100644
--- 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;
}