Merge "Closes-Bug:#1610578 - Overlap of labels in the charts & Reduce…

…d space between Donut Charts" into R3.1
Juniper · Aug 8, 2016 · 510d059 · 510d059
2 parents e897d44 + c1226f3
commit 510d059
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/webroot/monitor/infrastructure/common/ui/css/monitor.infra.css b/webroot/monitor/infrastructure/common/ui/css/monitor.infra.css
@@ -30,7 +30,13 @@
     font-weight:600;
     font-size:11px !important;
 }
+#config-nodes-donutchart-section{
+    margin-top:40px;
+}
 #analytics-nodes-chart .chartMargin{
     margin:0 10px 0 10px !important;
 }
+#config-nodes-donutchart-one .nvd3-svg{
+    margin-left:20%;
+ }
 /******Config Node chart and Analytics node chart Ends here****/
diff --git a/webroot/monitor/infrastructure/common/ui/js/views/AnalyticsNodesSummaryChartsView.js b/webroot/monitor/infrastructure/common/ui/js/views/AnalyticsNodesSummaryChartsView.js
@@ -77,7 +77,7 @@ define(['underscore', 'contrail-view',
                                axisLabelFontSize: 11,
                                tickPadding: 8,
                                margin: {
-                                   left: 40,
+                                   left: 55,
                                    top: 35,
                                    right: 0,
                                    bottom: 40
@@ -168,7 +168,7 @@ define(['underscore', 'contrail-view',
                                axisLabelFontSize: 11,
                                tickPadding: 4,
                                margin: {
-                                   left: 50,
+                                   left: 55,
                                    top: 35,
                                    right: 0,
                                    bottom: 40
@@ -296,7 +296,7 @@ define(['underscore', 'contrail-view',
                                axisLabelFontSize: 11,
                                tickPadding: 8,
                                margin: {
-                                   left: 50,
+                                   left: 55,
                                    top: 35,
                                    right: 0,
                                    bottom: 40
@@ -390,7 +390,7 @@ define(['underscore', 'contrail-view',
                                axisLabelFontSize: 11,
                                tickPadding: 8,
                                margin: {
-                                   left: 40,
+                                   left: 55,
                                    top: 35,
                                    right: 0,
                                    bottom: 40

diff --git a/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js b/webroot/monitor/infrastructure/common/ui/js/views/ConfigNodeDonutChartView.js
@@ -33,7 +33,7 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                                          response, ['GET'], colorMap);
                             },
                             chartOptions: {
-                                height: 205,
+                                height: 170,
                                 margin: {
                                     top: 10,
                                     bottom: 10
@@ -56,7 +56,7 @@ define(['underscore', 'contrail-view'],function(_, ContrailView){
                                          response, ['POST', 'PUT', 'DELETE'], colorMap);
                             },
                             chartOptions: {
-                                height: 205,
+                                height: 170,
                                 margin: {
                                     bottom: 10,
                                     top: 10