diff --git a/public/dashboard.css b/public/dashboard.css index 7cea080..7983918 100644 --- a/public/dashboard.css +++ b/public/dashboard.css @@ -22,8 +22,7 @@ body, float: right; position: relative; right: 30px; - top: 100px; - font: 50px 'PT Sans' sans-serif; + font: 50px 'PT Sans', sans-serif; letter-spacing: -0.05em; color: #444; } @@ -31,7 +30,7 @@ body, .label { text-transform: uppercase; text-indent: 25px; - font: 12px 'PT Sans' sans-serif; + font: 12px 'PT Sans', sans-serif; font-weight: bold; line-height: 20px; color: #888; @@ -112,7 +111,7 @@ body, .module { margin-top: 5px; margin-left: 25px; - font: 13px 'PT Sans' sans-serif; + font: 13px 'PT Sans', sans-serif; line-height: 20px; color: #888; } diff --git a/public/lib/stats-vcloud-numbers.js b/public/lib/stats-vcloud-numbers.js index c08d390..d308a56 100644 --- a/public/lib/stats-vcloud-numbers.js +++ b/public/lib/stats-vcloud-numbers.js @@ -1,6 +1,6 @@ var numbers_url = '/dashboard/stats/vcloud/numbers'; var numbers_width = 130; -var numbers_height = 45; +var numbers_height = 50; var stats_vcloud_numbers__data = {}; var stats_vcloud_numbers__svg = {}; @@ -31,10 +31,10 @@ d3.json( numbers_url, stats_vcloud_numbers__svg[ 'ready' ] = d3.select( '#stats-vcloud-numbers' ) .append( 'svg' ) - .style( 'margin', '10 25 0 0' ) - .style( 'padding', '0 0 20 0' ) - .attr( 'width', numbers_width ) - .attr( 'height', numbers_height ); + .style( 'margin', '10px 25px 0px 0px' ) + .style( 'padding', '0px 0px 20px 0px' ) + .attr( 'width', numbers_width + 'px' ) + .attr( 'height', numbers_height + 'px' ); stats_vcloud_numbers__svg[ 'ready' ] .append( 'text' ) @@ -43,8 +43,8 @@ d3.json( numbers_url, ) .attr( { 'x': '5', - 'y': numbers_height + 6, - 'font-face': 'PT Sans sans-serif', + 'y': numbers_height, + 'font-face': '\'PT Sans\', sans-serif', 'font-size': '12px', 'font-weight': 'bold', 'fill': '#888' @@ -58,7 +58,7 @@ d3.json( numbers_url, .attr( { 'x': '0', 'y': '36', - 'font-face': 'PT Sans sans-serif', + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '50px', 'letter-spacing': '-0.05em', @@ -67,10 +67,10 @@ d3.json( numbers_url, stats_vcloud_numbers__svg[ 'pending' ] = d3.select( '#stats-vcloud-numbers' ) .append( 'svg' ) - .style( 'margin', '10 25 0 0' ) - .style( 'padding', '0 0 20 0' ) - .attr( 'width', numbers_width ) - .attr( 'height', numbers_height ); + .style( 'margin', '10px 25px 0px 0px' ) + .style( 'padding', '0px 0px 20px 0px' ) + .attr( 'width', numbers_width + 'px' ) + .attr( 'height', numbers_height + 'px' ); stats_vcloud_numbers__svg[ 'pending' ] .append( 'text' ) @@ -79,8 +79,8 @@ d3.json( numbers_url, ) .attr( { 'x': '5', - 'y': numbers_height + 6, - 'font-face': 'PT Sans sans-serif', + 'y': numbers_height, + 'font-face': '\'PT Sans\', sans-serif', 'font-size': '12px', 'font-weight': 'bold', 'fill': '#888' @@ -94,7 +94,7 @@ d3.json( numbers_url, .attr( { 'x': '0', 'y': '36', - 'font-face': 'PT Sans sans-serif', + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '50px', 'letter-spacing': '-0.05em', @@ -103,10 +103,10 @@ d3.json( numbers_url, stats_vcloud_numbers__svg[ 'running' ] = d3.select( '#stats-vcloud-numbers' ) .append( 'svg' ) - .style( 'margin', '10 25 0 0' ) - .style( 'padding', '0 0 20 0' ) - .attr( 'width', numbers_width ) - .attr( 'height', numbers_height ); + .style( 'margin', '10px 25px 0px 0px' ) + .style( 'padding', '0px 0px 20px 0px' ) + .attr( 'width', numbers_width + 'px' ) + .attr( 'height', numbers_height + 'px' ); stats_vcloud_numbers__svg[ 'running' ] .append( 'text' ) @@ -115,8 +115,8 @@ d3.json( numbers_url, ) .attr( { 'x': '5', - 'y': numbers_height + 6, - 'font-face': 'PT Sans sans-serif', + 'y': numbers_height, + 'font-face': '\'PT Sans\', sans-serif', 'font-size': '12px', 'font-weight': 'bold', 'fill': '#888' @@ -130,7 +130,7 @@ d3.json( numbers_url, .attr( { 'x': '0', 'y': '36', - 'font-face': 'PT Sans sans-serif', + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '50px', 'letter-spacing': '-0.05em', @@ -139,10 +139,10 @@ d3.json( numbers_url, stats_vcloud_numbers__svg[ 'completed' ] = d3.select( '#stats-vcloud-numbers' ) .append( 'svg' ) - .style( 'margin', '10 25 0 0' ) - .style( 'padding', '0 0 20 0' ) - .attr( 'width', numbers_width ) - .attr( 'height', numbers_height ); + .style( 'margin', '10px 25px 0px 0px' ) + .style( 'padding', '0px 0px 20px 0px' ) + .attr( 'width', numbers_width + 'px' ) + .attr( 'height', numbers_height + 'px' ); stats_vcloud_numbers__svg[ 'completed' ] .append( 'text' ) @@ -151,8 +151,8 @@ d3.json( numbers_url, ) .attr( { 'x': '5', - 'y': numbers_height + 6, - 'font-face': 'PT Sans sans-serif', + 'y': numbers_height, + 'font-face': '\'PT Sans\', sans-serif', 'font-size': '12px', 'font-weight': 'bold', 'fill': '#888' @@ -166,7 +166,7 @@ d3.json( numbers_url, .attr( { 'x': '0', 'y': '36', - 'font-face': 'PT Sans sans-serif', + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '50px', 'letter-spacing': '-0.05em', diff --git a/public/lib/stats-vcloud-pool.js b/public/lib/stats-vcloud-pool.js index 077cda1..fb7a2d6 100644 --- a/public/lib/stats-vcloud-pool.js +++ b/public/lib/stats-vcloud-pool.js @@ -1,6 +1,6 @@ var pool_url = '/dashboard/stats/vcloud/pool'; var pool_width = 130; -var pool_height = 70; +var pool_height = 85; var stats_vcloud_pool__data = {}; var stats_vcloud_pool__svg = {}; @@ -49,7 +49,7 @@ d3.json( pool_url+'?history=1', var area = d3.svg.area() .interpolate( 'basis' ) .x( function( d, i ) { return x( i ); } ) - .y0( pool_height ) + .y0( pool_height - 15 ) .y1( function( d ) { return y( d ); } ); var path = d3.svg.line() @@ -69,15 +69,15 @@ d3.json( pool_url+'?history=1', stats_vcloud_pool__svg[ pool ] = d3.select( '#stats-vcloud-pool' ) .append( 'svg' ) - .style( 'margin', '15 25 0 0' ) - .style( 'padding', '0 0 20 0' ) + .style( 'margin', '15px 25px 0px 0px' ) + .style( 'padding', '0px 0px 20px 0px' ) .attr( 'width', pool_width ) .attr( 'height', pool_height ); stats_vcloud_pool__svg[ pool ] .append( 'g' ) .attr( 'class', 'x tick' ) - .attr( 'transform', 'translate( 0,' + pool_height + ')' ) + .attr( 'transform', 'translate( 0,' + ( pool_height - 15 ) + ')' ) .call( d3.svg.axis() .scale( x ) @@ -96,8 +96,8 @@ d3.json( pool_url+'?history=1', ) .attr( { 'x': '5', - 'y': pool_height + 15, - 'font-face': 'PT Sans sans-serif', + 'y': pool_height - 2, + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '12px', 'fill': '#888' @@ -110,8 +110,8 @@ d3.json( pool_url+'?history=1', ) .attr( { 'x': '5', - 'y': pool_height - 5, - 'font-face': 'PT Sans sans-serif', + 'y': pool_height - 20, + 'font-face': '\'PT Sans\', sans-serif', 'font-weight': 'bold', 'font-size': '12px', 'letter-spacing': '-0.05em', @@ -129,8 +129,8 @@ d3.json( pool_url+'?history=1', ) .attr( { 'x': 40, - 'y': pool_height - 5, - 'font-face': 'PT Sans sans-serif', + 'y': pool_height - 20, + 'font-face': '\'PT Sans\', sans-serif', 'font-size': '12px', 'letter-spacing': '-0.05em', 'fill': '#888'