summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-24 09:39:57 +0900
committerGitHub <noreply@github.com>2018-08-24 09:39:57 +0900
commit5ba36efcd2c8254e44685a932d2bef346c0388f2 (patch)
tree0ed247cb6bc7b5b9cde15bec1458c1ed925c69cd /src
parentMerge pull request #2445 from syuilo/develop (diff)
parent8.7.0 (diff)
downloadsharkey-5ba36efcd2c8254e44685a932d2bef346c0388f2.tar.gz
sharkey-5ba36efcd2c8254e44685a932d2bef346c0388f2.tar.bz2
sharkey-5ba36efcd2c8254e44685a932d2bef346c0388f2.zip
Merge pull request #2446 from syuilo/develop
8.7.0
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/pages/admin/admin.chart.chart.ts4
-rw-r--r--src/client/app/desktop/views/pages/admin/admin.chart.vue4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
index 9fb18fd039..6a241631e9 100644
--- a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
@@ -32,7 +32,9 @@ export default Vue.extend({
}]
},
tooltips: {
- intersect: false
+ intersect: false,
+ mode: 'x',
+ position: 'nearest'
}
}, this.opts || {}));
}
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue
index caaeeaeda1..4301f9978b 100644
--- a/src/client/app/desktop/views/pages/admin/admin.chart.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue
@@ -102,6 +102,7 @@ export default Vue.extend({
fill: false,
borderColor: '#555',
borderWidth: 2,
+ borderDash: [4, 4],
pointBackgroundColor: '#fff',
lineTension: 0,
data: data.map(x => ({ t: x.date, y: x.all }))
@@ -228,7 +229,8 @@ export default Vue.extend({
return [{
datasets: [{
label: local ? 'Local Drive Files' : 'Remote Drive Files',
- fill: false,
+ fill: true,
+ backgroundColor: 'rgba(246, 88, 79, 0.1)',
borderColor: '#f6584f',
borderWidth: 2,
pointBackgroundColor: '#fff',