diff --git a/www/plugins/graph/js/controllers/blockchain-controllers.js b/www/plugins/graph/js/controllers/blockchain-controllers.js index 8557f314a15993245589f890683d778b6b9ba9df..84e222597a7bc20bd09c9a57a32d6444707b87e5 100644 --- a/www/plugins/graph/js/controllers/blockchain-controllers.js +++ b/www/plugins/graph/js/controllers/blockchain-controllers.js @@ -226,7 +226,8 @@ function GpBlockchainTxCountController($scope, $q, $state, $filter, $translate, { yAxisID: 'y-axis-amount', type: 'bar', - label: translations['GRAPH.BLOCKCHAIN.TX_AMOUNT_LABEL'] + label: translations['GRAPH.BLOCKCHAIN.TX_AMOUNT_LABEL'], + hoverBackgroundColor: 'rgba(17,193,243,0.6)' }, { yAxisID: 'y-axis-count', @@ -234,7 +235,12 @@ function GpBlockchainTxCountController($scope, $q, $state, $filter, $translate, label: translations['GRAPH.BLOCKCHAIN.TX_COUNT_LABEL'], fill: false, borderColor: 'rgba(150,150,150,0.5)', - borderWidth: 2 + borderWidth: 2, + pointBackgroundColor: 'rgba(150,150,150,0.5)', + pointBorderColor: 'rgba(255,255,255,1)', + pointHoverBackgroundColor: 'rgba(150,150,150,1)', + pointHoverBorderColor: 'rgba(0,0,0,0)', + pointRadius: 3 }, { yAxisID: 'y-axis-avg', diff --git a/www/plugins/graph/js/controllers/currency-controllers.js b/www/plugins/graph/js/controllers/currency-controllers.js index a8d6e5e5f4f7a299de021ab6d02eb9b5f269488f..6be0e111aa7cf86fd110a0fd3e223d50ff7d223e 100644 --- a/www/plugins/graph/js/controllers/currency-controllers.js +++ b/www/plugins/graph/js/controllers/currency-controllers.js @@ -263,7 +263,7 @@ function GpCurrencyMonetaryMassController($scope, $q, $state, $translate, $ionic yAxisID: 'y-axis-mass', type: 'bar', label: translations['GRAPH.CURRENCY.MONETARY_MASS_LABEL'], - hoverBackgroundColor: 'rgba(17,193,243,0.7)' + hoverBackgroundColor: 'rgba(17,193,243,0.6)' }, { yAxisID: 'y-axis-mn', @@ -446,7 +446,7 @@ function GpCurrencyDUController($scope, $q, $controller, $translate, gpData, $fi yAxisID: 'y-axis-ud', type: 'bar', label: translations['COMMON.UNIVERSAL_DIVIDEND'], - hoverBackgroundColor: 'rgba(17,193,243,0.7)' + hoverBackgroundColor: 'rgba(17,193,243,0.6)' }]; // Keep only block number (need for click) @@ -546,7 +546,7 @@ function GpCurrencyMembersCountController($scope, $q, $state, $translate, csCurr }; $scope.datasetOverride = [{ yAxisID: 'y-axis-1', - type: 'bar', + type: 'line', label: translations['GRAPH.CURRENCY.MEMBERS_COUNT_LABEL'], hoverBackgroundColor: 'rgba(17,193,243,0.7)' }]; diff --git a/www/plugins/graph/templates/currency/graph_members_count.html b/www/plugins/graph/templates/currency/graph_members_count.html index d9ae958df6e5a7c61f82e05d1fdb933dade2884e..2b26b0a4cb9760a31ff528350ce430bb7aeb6620 100644 --- a/www/plugins/graph/templates/currency/graph_members_count.html +++ b/www/plugins/graph/templates/currency/graph_members_count.html @@ -1,4 +1,4 @@ - <canvas id="membersCount-bar" class="chart-bar" + <canvas id="membersCount-bar" class="chart-line" height="{{height}}" width="{{width}}" chart-data="data"