jekyll-zeta 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92e9c3d10127af0ab175e41aa41643467f0a73eac8027ae0f350f06c2ebd67ba
-  data.tar.gz: 3e9fa286e582ad2ed5acbc0a3d7c40baa51a34211789626c208a04afa3ba3b80
+  metadata.gz: 296a6b6bbe54d383581d83672595504ad21ad253bdcd8a91006b8a540edecc1b
+  data.tar.gz: 70c6f2449a68137be28bcdaa09b4fae7c33da9a082714609195e9f1e335ad293
 SHA512:
-  metadata.gz: 860c508e7587807af43753eba3de599a51ef42acca73128c0460aa988260b34eb3c1a0b0e2d2fc3a13e73f9c301bd2c3e3b80292a670b5d366fe15e6948bd618
-  data.tar.gz: 9ca90a4536c7c716eb5b43349106475d14d34678cd6bf6db757cfdf3f4d2eb9c7c3864f968b0f95b987eb9fb498a000c481e4217ca16e3af0c7d081d1bed34fd
+  metadata.gz: 5bfd9df77e9e6d6c2b7a7560682762ede28a795a7cae4fc05394c09ecd5f20921edb3b0f2bd6563778e00fad1b02e9ccac472a8f36fc6459247eff3fb360d75e
+  data.tar.gz: 40ecc15e66f49c8e73ad10d7dd497f209036d3007b1d0826122363eaf961852e8394597d80f65ec281ee874604f5e528a09307be0dae38ce7e6b1b78d18781b5

data/_includes/heatmap.js

@@ -34,8 +34,29 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
     if (yearCfg[preYear]) {
       arr.push(getYearData(preYear ))
     }
-    Promise.all(arr).then(d2=>{
-      updateCell({...d2[0],...d2[1]});
+    Promise.all(arr).then(alldata=>{
+      let combineData = {};
+      let d1 = alldata[0];
+      let d2 = alldata[1];
+      
+      for (const key in d1) {
+        if (Object.prototype.hasOwnProperty.call(d1, key)) {
+          const element = d1[key];
+          let keyNew = 'K1-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+      for (const key in d2) {
+        if (Object.prototype.hasOwnProperty.call(d2, key)) {
+          const element = d2[key];
+          let keyNew = 'K2-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+
+      updateCell(combineData);
     })
   })
 
@@ -53,6 +74,8 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
   function updateCell(data){
     if(!data)return
 
+    console.log(data)
+
     let daysEle = document.getElementById(dayEleId)
     let dayCells = daysEle.childNodes
 
@@ -173,7 +196,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
 
 
     function updateMultiDays(){
-      let day = 6;
+      let day = 13;
       while (day -- ) {
         update1Day();
       }
@@ -183,10 +206,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
       }
 
     }
-
-    setTimeout(() => {
-      requestAnimationFrame(updateMultiDays)
-    }, 200);
+    requestAnimationFrame(updateMultiDays)
     
     return
  

data/_sass/jekyll-zeta.scss

@@ -9,12 +9,9 @@ $color-lightGrayBg: #F0f2f4;
 $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;
 
 $dbgBorder:none;//ssolid 1px red;
-$hmbloksizeW:11px;
+// $hmbloksizeW:11px;
 $hmbloksizeH:13px;
 $dayGap:1px;
-$hmdaywidth: $dayGap * 52 + $hmbloksizeW * 53;
-$hmmonthWidth:40px;
-$hmmwidth: $hmmonthWidth + $hmdaywidth;
 li {
   padding: 0.2rem;
 }
@@ -50,7 +47,7 @@ article{
 .w {
   margin: auto;
   max-width: 960px;
-  padding: 2em ;
+  padding: 2em 0.2rem;
   word-wrap: break-word;
   background-color: white;
   // box-shadow: 0 2px 3px 0 #eee
@@ -343,9 +340,8 @@ img{
 .heatmap{
   display: grid;
   grid-template-rows: auto 1fr;
-  grid-template-columns: $hmmonthWidth 1fr;
-  width: $hmmwidth;
-  border: $dbgBorder;
+  grid-template-columns: auto 1fr;
+  max-width: 640px;
 }
 
 .heatmap-title{
@@ -362,7 +358,6 @@ img{
   display: grid;
   grid-template-columns: repeat(12,1fr);
 
-  width: $hmdaywidth;
   border: $dbgBorder;
   
 }
@@ -400,7 +395,7 @@ img{
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-right: 10px;
+  padding-right: 0.2em;
   font-size: 0.8rem;
   font-family:  $heatFont
 }
@@ -412,14 +407,13 @@ img{
   grid-template-rows: repeat(7,1fr);
   grid-auto-flow: column;
   gap: $dayGap;
-  width: $hmdaywidth;
 }
 
 .heatmap-day-cell{
 
   border-radius: 2px;
   // height: 20px;
-  width: $hmbloksizeW;
+  // width: $hmbloksizeW;
   height: $hmbloksizeH;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-23 00:00:00.000000000 Z
+date: 2024-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll