SONAR-6331 apply feedback

diff --git a/server/sonar-web/src/main/js/apps/overview/common-components.js b/server/sonar-web/src/main/js/apps/overview/common-components.js
index 30decc3c7c880c94a28d96d94d2634cecb966e68..d1299d539e8ad256fbbe54c3e94b14f2cd223ffc 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/common-components.js
+++ b/server/sonar-web/src/main/js/apps/overview/common-components.js
@@ -46,10 +46,9 @@ export const Legend = React.createClass({
     if (!this.props.leakPeriodDate) {
       return null;
     }
-    return <ul className="overview-legend list-inline">
-      <li><span className="overview-legend-nutshell"/> Nutshell</li>
-      <li><span className="overview-legend-leak"/> <DomainLeakTitle label={this.props.leakPeriodLabel}
-                                                                    date={this.props.leakPeriodDate}/></li>
-    </ul>;
+    return <div className="overview-legend">
+      <span className="overview-legend-leak"/>
+      <DomainLeakTitle label={this.props.leakPeriodLabel} date={this.props.leakPeriodDate}/>
+    </div>;
   }
 });

diff --git a/server/sonar-web/src/main/js/apps/overview/coverage/main.js b/server/sonar-web/src/main/js/apps/overview/coverage/main.js
index 7971f22d1825ad85f6702394bae944aedc59cd7d..1c5c62d518a03f3af7991911920ae438eda0120e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/coverage/main.js
+++ b/server/sonar-web/src/main/js/apps/overview/coverage/main.js
@@ -151,7 +151,7 @@ export const CoverageMain = React.createClass({
         .range(CHART_COLORS_RANGE_PERCENT);
     return <div className="overview-detailed-page">
       <div className="overview-domain-charts">
-        <div className="overview-domain">
+        <div className="overview-domain overview-domain-fixed-width">
           <div className="overview-domain-header">
             <div className="overview-title">Tests Overview</div>
             {this.renderLegend()}

diff --git a/server/sonar-web/src/main/js/apps/overview/duplications/main.js b/server/sonar-web/src/main/js/apps/overview/duplications/main.js
index a3aa1d482dd4968c34d8f49678a17af69c98dd2e..d85d3790f87cf09091ead9dfce336daee9294f16 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/duplications/main.js
+++ b/server/sonar-web/src/main/js/apps/overview/duplications/main.js
@@ -86,7 +86,7 @@ export const DuplicationsMain = React.createClass({
         .range(CHART_COLORS_RANGE_PERCENT);
     return <div className="overview-detailed-page">
       <div className="overview-domain-charts">
-        <div className="overview-domain">
+        <div className="overview-domain overview-domain-fixed-width">
           <div className="overview-domain-header">
             <div className="overview-title">Duplications Overview</div>
             {this.renderLegend()}
@@ -97,8 +97,8 @@ export const DuplicationsMain = React.createClass({
         </div>
         <DomainBubbleChart {...this.props}
             xMetric="ncloc"
-            yMetric="duplicated_blocks"
-            sizeMetrics={['duplicated_lines']}/>
+            yMetric="duplicated_lines"
+            sizeMetrics={['duplicated_blocks']}/>
       </div>
 
       <div className="overview-domain-charts">

diff --git a/server/sonar-web/src/main/js/apps/overview/main/coverage.js b/server/sonar-web/src/main/js/apps/overview/main/coverage.js
index 48e9d888ba87f63973eafbdfdc8aecb64d5a8872..056876f3e545d143d97acd46cd4aa11be6a14fcf 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/main/coverage.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/coverage.js
@@ -45,7 +45,7 @@ export const GeneralCoverage = React.createClass({
     }
 
     return <Domain>
-      <DomainHeader title="Tests" linkTo="/tests"/>
+      <DomainHeader title="Coverage" linkTo="/tests"/>
 
       <DomainPanel domain="coverage">
         <DomainNutshell>

diff --git a/server/sonar-web/src/main/js/apps/overview/main/main.js b/server/sonar-web/src/main/js/apps/overview/main/main.js
index 268bc4682d5e7bc1780fadde8c4293f68f1ee511..d23555cb0e086fbac10803168eb2dcf40dbda795 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/main/main.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/main.js
@@ -25,7 +25,7 @@ const METRICS_LIST = [
 ];
 
 const HISTORY_METRICS_LIST = [
-  'violations',
+  'sqale_index',
   'overall_coverage',
   'duplicated_lines_density',
   'ncloc'
@@ -158,7 +158,7 @@ export default React.createClass({
     let props = _.extend({}, this.props, this.state);
 
     return <div className="overview-domains">
-      <GeneralIssues {...props} history={this.state.history['violations']}/>
+      <GeneralIssues {...props} history={this.state.history['sqale_index']}/>
       <GeneralCoverage {...props} history={this.state.history['overall_coverage']}/>
       <GeneralDuplications {...props} history={this.state.history['duplicated_lines_density']}/>
       <GeneralSize {...props} history={this.state.history['ncloc']}/>

diff --git a/server/sonar-web/src/main/less/pages/overview.less b/server/sonar-web/src/main/less/pages/overview.less
index 5f5cee8629f0538fff1c3338f93e94f7c5a76867..ecad13667f4f45a81849627381445e5aeef9e85e 100644 (file)
--- a/server/sonar-web/src/main/less/pages/overview.less
+++ b/server/sonar-web/src/main/less/pages/overview.less
@@ -130,6 +130,10 @@
   margin: 30px @side-padding;
 }
 
+.overview-domain-fixed-width {
+  max-width: 560px;
+}
+
 .overview-domain-header {
   display: flex;
   align-items: baseline;
@@ -302,7 +306,6 @@
   padding: 0 10px;
 }
 
-.overview-legend-nutshell,
 .overview-legend-leak {
   display: inline-block;
   vertical-align: middle;
@@ -313,13 +316,6 @@
   margin-right: 8px;
   border: 1px solid @barBorderColor;
   box-sizing: border-box;
-}
-
-.overview-legend-nutshell {
-  background-color: #fff;
-}
-
-.overview-legend-leak {
   background-color: #fffae7;
 }
 
@@ -334,10 +330,6 @@
   & > .overview-domain-chart {
     flex: 1;
   }
-
-  & > .overview-domain {
-    max-width: 560px;
-  }
 }
 
 .overview-domain-chart {