SONAR-5209 SCM

diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index c06684a5902e0d4433b9a892c4ec54985145e4a9..1003f40e9a060ebcbd8d106eeed7d4a59511105c 100644 (file)
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -19,7 +19,7 @@
 
   <div class="component-viewer-header-measures">
     <div class="component-viewer-header-measures-scope">
-      <span data-scope="coverage" class="js-toggle-coverage component-viewer-header-measures-toggle-scope inactive"></span>
+      <span data-scope="basic" class="js-toggle-coverage component-viewer-header-measures-toggle-scope inactive"></span>
       <a data-scope="basic" class="component-viewer-header-measures-expand">
         <div class="component-viewer-header-measure">
           <span class="component-viewer-header-measure-value">{{component.measures.fNcloc}}</span>
@@ -90,6 +90,17 @@
            class="js-toggle-duplications component-viewer-header-measures-toggle-scope {{#if settings.duplications}}active{{/if}}"></a>
       </div>
     {{/if}}
+
+    <div class="component-viewer-header-measures-scope">
+      <span data-scope="scm" class="component-viewer-header-measures-expand">
+        <div class="component-viewer-header-measure">
+          <span class="component-viewer-header-measure-value"><i class="icon-calendar"></i></span>
+          <span class="component-viewer-header-measure-label">SCM</span>
+        </div>
+      </span>
+      <a data-scope="scm" title="{{t 'component_viewer.header.toggle_duplications'}}"
+         class="js-toggle-scm component-viewer-header-measures-toggle-scope {{#if settings.scm}}active{{/if}}"></a>
+    </div>
   </div>
 </div>
 

diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 7d37c11a60df4b591a70b4e0acecc05e4fa0cf1c..00d001142748fc7d806079e947e1a86814b7d323 100644 (file)
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -325,15 +325,18 @@
   display: block;
   padding: 10px 20px;
   white-space: nowrap;
-  .trans(background);
 
-  &:hover { background-color: @barBorderColor; }
+  a& {
+    .trans(background);
 
-  &:active, &.active {
-    margin-bottom: -1px;
-    border-bottom: 1px solid #fff;
-    border-left-color: @barBorderColor;
-    background-color: #fff;
+    &:hover { background-color: @barBorderColor; }
+
+    &:active, &.active {
+      margin-bottom: -1px;
+      border-bottom: 1px solid #fff;
+      border-left-color: @barBorderColor;
+      background-color: #fff;
+    }
   }
 }
 
@@ -368,7 +371,10 @@
   color: @baseFontColor;
   font-size: 18px;
 
-  i { top: -3px; }
+  i {
+    position: relative;
+    top: -2px;
+  }
 }
 
 .component-viewer-header-measure-issues {

diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index be2938b5eb6514e70eddfbb58335f2719ed371e2..e3a950917fba617d371d8fee28204041666d2136 100644 (file)
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -298,10 +298,8 @@ a[class^="icon-"], a[class*=" icon-"] {
   font-size: @iconSmallFontSize;
 }
 .icon-calendar:before {
-  position: relative;
-  top: -0.1em;
   content: "\f073";
-  font-size: @iconSmallFontSize;
+  font-size: @iconFontSize;
 }
 .icon-favorite { font-size: @iconFontSize; }
 .icon-favorite:before {

diff --git a/sonar-server/src/main/webapp/fonts/sonar.woff b/sonar-server/src/main/webapp/fonts/sonar.woff
index fac51f900b880460f70238175c43f630581c0faf..fd856e1f43202e5c245440b4c13e7f01f2cf8de4 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.woff and b/sonar-server/src/main/webapp/fonts/sonar.woff differ