jekyll-zeta 0.7.2 → 0.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/_includes/heatmap.js +27 -7
- data/_sass/jekyll-zeta.scss +6 -12
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 296a6b6bbe54d383581d83672595504ad21ad253bdcd8a91006b8a540edecc1b
|
4
|
+
data.tar.gz: 70c6f2449a68137be28bcdaa09b4fae7c33da9a082714609195e9f1e335ad293
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5bfd9df77e9e6d6c2b7a7560682762ede28a795a7cae4fc05394c09ecd5f20921edb3b0f2bd6563778e00fad1b02e9ccac472a8f36fc6459247eff3fb360d75e
|
7
|
+
data.tar.gz: 40ecc15e66f49c8e73ad10d7dd497f209036d3007b1d0826122363eaf961852e8394597d80f65ec281ee874604f5e528a09307be0dae38ce7e6b1b78d18781b5
|
data/_includes/heatmap.js
CHANGED
@@ -34,8 +34,29 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
|
|
34
34
|
if (yearCfg[preYear]) {
|
35
35
|
arr.push(getYearData(preYear ))
|
36
36
|
}
|
37
|
-
Promise.all(arr).then(
|
38
|
-
|
37
|
+
Promise.all(arr).then(alldata=>{
|
38
|
+
let combineData = {};
|
39
|
+
let d1 = alldata[0];
|
40
|
+
let d2 = alldata[1];
|
41
|
+
|
42
|
+
for (const key in d1) {
|
43
|
+
if (Object.prototype.hasOwnProperty.call(d1, key)) {
|
44
|
+
const element = d1[key];
|
45
|
+
let keyNew = 'K1-' + key;
|
46
|
+
combineData[keyNew] = element
|
47
|
+
}
|
48
|
+
}
|
49
|
+
|
50
|
+
for (const key in d2) {
|
51
|
+
if (Object.prototype.hasOwnProperty.call(d2, key)) {
|
52
|
+
const element = d2[key];
|
53
|
+
let keyNew = 'K2-' + key;
|
54
|
+
combineData[keyNew] = element
|
55
|
+
}
|
56
|
+
}
|
57
|
+
|
58
|
+
|
59
|
+
updateCell(combineData);
|
39
60
|
})
|
40
61
|
})
|
41
62
|
|
@@ -53,6 +74,8 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
|
|
53
74
|
function updateCell(data){
|
54
75
|
if(!data)return
|
55
76
|
|
77
|
+
console.log(data)
|
78
|
+
|
56
79
|
let daysEle = document.getElementById(dayEleId)
|
57
80
|
let dayCells = daysEle.childNodes
|
58
81
|
|
@@ -173,7 +196,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
|
|
173
196
|
|
174
197
|
|
175
198
|
function updateMultiDays(){
|
176
|
-
let day =
|
199
|
+
let day = 13;
|
177
200
|
while (day -- ) {
|
178
201
|
update1Day();
|
179
202
|
}
|
@@ -183,10 +206,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
|
|
183
206
|
}
|
184
207
|
|
185
208
|
}
|
186
|
-
|
187
|
-
setTimeout(() => {
|
188
|
-
requestAnimationFrame(updateMultiDays)
|
189
|
-
}, 200);
|
209
|
+
requestAnimationFrame(updateMultiDays)
|
190
210
|
|
191
211
|
return
|
192
212
|
|
data/_sass/jekyll-zeta.scss
CHANGED
@@ -9,12 +9,9 @@ $color-lightGrayBg: #F0f2f4;
|
|
9
9
|
$heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR PL SungtiL GB",NSimSun,SimSun,"TW\-Sung","WenQuanYi Bitmap Song","AR PL UMing CN","AR PL UMing HK","AR PL UMing TW","AR PL UMing TW MBE",sans-serif;
|
10
10
|
|
11
11
|
$dbgBorder:none;//ssolid 1px red;
|
12
|
-
$hmbloksizeW:11px;
|
12
|
+
// $hmbloksizeW:11px;
|
13
13
|
$hmbloksizeH:13px;
|
14
14
|
$dayGap:1px;
|
15
|
-
$hmdaywidth: $dayGap * 52 + $hmbloksizeW * 53;
|
16
|
-
$hmmonthWidth:40px;
|
17
|
-
$hmmwidth: $hmmonthWidth + $hmdaywidth;
|
18
15
|
li {
|
19
16
|
padding: 0.2rem;
|
20
17
|
}
|
@@ -50,7 +47,7 @@ article{
|
|
50
47
|
.w {
|
51
48
|
margin: auto;
|
52
49
|
max-width: 960px;
|
53
|
-
padding: 2em ;
|
50
|
+
padding: 2em 0.2rem;
|
54
51
|
word-wrap: break-word;
|
55
52
|
background-color: white;
|
56
53
|
// box-shadow: 0 2px 3px 0 #eee
|
@@ -343,9 +340,8 @@ img{
|
|
343
340
|
.heatmap{
|
344
341
|
display: grid;
|
345
342
|
grid-template-rows: auto 1fr;
|
346
|
-
grid-template-columns:
|
347
|
-
width:
|
348
|
-
border: $dbgBorder;
|
343
|
+
grid-template-columns: auto 1fr;
|
344
|
+
max-width: 640px;
|
349
345
|
}
|
350
346
|
|
351
347
|
.heatmap-title{
|
@@ -362,7 +358,6 @@ img{
|
|
362
358
|
display: grid;
|
363
359
|
grid-template-columns: repeat(12,1fr);
|
364
360
|
|
365
|
-
width: $hmdaywidth;
|
366
361
|
border: $dbgBorder;
|
367
362
|
|
368
363
|
}
|
@@ -400,7 +395,7 @@ img{
|
|
400
395
|
display: flex;
|
401
396
|
align-items: center;
|
402
397
|
justify-content: center;
|
403
|
-
padding-right:
|
398
|
+
padding-right: 0.2em;
|
404
399
|
font-size: 0.8rem;
|
405
400
|
font-family: $heatFont
|
406
401
|
}
|
@@ -412,14 +407,13 @@ img{
|
|
412
407
|
grid-template-rows: repeat(7,1fr);
|
413
408
|
grid-auto-flow: column;
|
414
409
|
gap: $dayGap;
|
415
|
-
width: $hmdaywidth;
|
416
410
|
}
|
417
411
|
|
418
412
|
.heatmap-day-cell{
|
419
413
|
|
420
414
|
border-radius: 2px;
|
421
415
|
// height: 20px;
|
422
|
-
width: $hmbloksizeW;
|
416
|
+
// width: $hmbloksizeW;
|
423
417
|
height: $hmbloksizeH;
|
424
418
|
}
|
425
419
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll-zeta
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- vitock
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-11-
|
11
|
+
date: 2024-11-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: jekyll
|