From 2e139e9d65cd6f3e13704490f3d581ec28f7fd5e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 8 Jun 2017 03:25:45 +0900
Subject: [PATCH] :art:
---
src/web/app/common/tags/activity-table.tag | 15 ++++-----------
.../app/desktop/tags/home-widgets/activity.tag | 13 +++----------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/web/app/common/tags/activity-table.tag b/src/web/app/common/tags/activity-table.tag
index 6627b8aa0e..49c5fe26cd 100644
--- a/src/web/app/common/tags/activity-table.tag
+++ b/src/web/app/common/tags/activity-table.tag
@@ -16,7 +16,7 @@
> rect
transform-origin center
- transform scale(0.9)
+ transform scale(0.8)
</style>
<script>
@@ -33,16 +33,9 @@
let x = 0;
data.reverse().forEach(d => {
d.x = x;
- d.v = d.total / this.peak;
- d.color = d.v > 0.75
- ? '#196127'
- : d.v > 0.5
- ? '#239a3b'
- : d.v > 0.25
- ? '#7bc96f'
- : d.v > 0
- ? '#c6e48b'
- : '#eee';
+ let v = d.total / this.peak;
+ if (v > 1) v = 1;
+ d.color = `hsl(180, ${v * 100}%, ${15 + ((1 - v) * 80)}%)`;
d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay();
if (d.date.weekday == 6) x++;
});
diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag
index d534db4e97..ba201e1c29 100644
--- a/src/web/app/desktop/tags/home-widgets/activity.tag
+++ b/src/web/app/desktop/tags/home-widgets/activity.tag
@@ -59,16 +59,9 @@
let x = 0;
data.reverse().forEach(d => {
d.x = x;
- d.v = d.total / this.peak;
- d.color = d.v > 0.75
- ? '#195061'
- : d.v > 0.5
- ? '#238f9a'
- : d.v > 0.25
- ? '#6fc5c9'
- : d.v > 0
- ? '#8be4dc'
- : '#eee';
+ let v = d.total / this.peak;
+ if (v > 1) v = 1;
+ d.color = `hsl(180, ${v * 100}%, ${15 + ((1 - v) * 80)}%)`;
d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay();
if (d.date.weekday == 6) x++;
});