usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2446 from syuilo/develop 

8.7.0
This commit is contained in:
syuilo 2018-08-24 09:39:57 +09:00 committed by GitHub
parent 91f8adc138 fd497ef105
commit 5ba36efcd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,8 +1,8 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "8.6.0", "version": "8.7.0",
"clientVersion": "1.0.8838", "clientVersion": "1.0.8840",
"codename": "nighthike", "codename": "nighthike",
"main": "./built/index.js", "main": "./built/index.js",
"private": true, "private": true,

4
src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
View File

@ -32,7 +32,9 @@ export default Vue.extend({
}] }]
}, },
tooltips: { tooltips: {
intersect: false intersect: false,
mode: 'x',
position: 'nearest'
} }
}, this.opts || {})); }, this.opts || {}));
} }

4
src/client/app/desktop/views/pages/admin/admin.chart.vue
View File

@ -102,6 +102,7 @@ export default Vue.extend({
fill: false, fill: false,
borderColor: '#555', borderColor: '#555',
borderWidth: 2, borderWidth: 2,
borderDash: [4, 4],
pointBackgroundColor: '#fff', pointBackgroundColor: '#fff',
lineTension: 0, lineTension: 0,
data: data.map(x => ({ t: x.date, y: x.all })) data: data.map(x => ({ t: x.date, y: x.all }))
@ -228,7 +229,8 @@ export default Vue.extend({
return [{ return [{
datasets: [{ datasets: [{
label: local ? 'Local Drive Files' : 'Remote Drive Files', label: local ? 'Local Drive Files' : 'Remote Drive Files',
fill: false, fill: true,
backgroundColor: 'rgba(246, 88, 79, 0.1)',
borderColor: '#f6584f', borderColor: '#f6584f',
borderWidth: 2, borderWidth: 2,
pointBackgroundColor: '#fff', pointBackgroundColor: '#fff',