jekyll-zeta 0.9.10 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd84b8ba748c01cfd4776295116a4bf6593ef12bb1662ad56cbb5b1db95a569
-  data.tar.gz: d57343875f6aa327652889884babf666f76552ea2cb9eb3063b70486d1d584cd
+  metadata.gz: e4cdf9ffeebd761d6a27651dca10b2754b301a836ae259609c3ac8ec7c8b7fcd
+  data.tar.gz: ad82a893a19ae99112d50c5683d859992bd468305162f217b836c00f76aecf75
 SHA512:
-  metadata.gz: 6893d527ca9c609ecc25d55baaccbf7ba58882239328aac78f6f9967b0ebc8819c69956566138a882177af01b9baa9bd395ab1750828a48c30ebbd81ae4db697
-  data.tar.gz: 7ea6209372677d4320c4673f5f51a67923b40fae6da0cd59236f285a30be0ad7f603ce78126169d913de97fa10821fabde14fff9a307ccf13b485e5c620ae34e
+  metadata.gz: 71a472490183230c4d75f2adacaf42c776fbf8117fffdfd640c5026ba490931d18f2710a5a12303d894499f139c4a7e07bc5761ff1f781169626fe5bc8ed663f
+  data.tar.gz: '032139e895e16f6f9dc8c3f285a3d3d203b621d4ed8eca0a458d4ae15b6433afe33a03cf5c824312673cdf5266a4f6637d39c4b4e576422270a28c1fa9527573'

data/_includes/getmapdata.js

@@ -113,6 +113,20 @@
       }
     })
 
+
+    if (dataObj.title ) {
+
+
+      let divTitle = document.createElement('div')
+      divTitle.className = 'custom-map-title'  
+      divTitle.innerText = dataObj.title || ''
+
+      let codeHolder = node.parentNode
+      codeHolder.insertBefore(divTitle,node)
+      
+    }
+    
+
     let allYearArr = Object.keys(allYear).sort().reverse()
     console.log(dataObj)
 

data/_includes/heatmap.js

@@ -1,9 +1,19 @@
-function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl,dataSourceObj,checkPrefix) {
-  checkPrefix = null
+function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl,dataSourceObj) {
+
+
+  function idx2Ymd(idx) {
+    let t = new Date(endStamp - (DayCount - 1 - idx) * 3600000 * 24);
+    let m = t.getMonth() + 1;
+    let d = t.getDate();
+    return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${
+      d < 10 ? "0" + d : d
+    }`;
+  }
   
-  const WeeKStart = parseInt(WeeKStartStr)
 
-  const color = dataSourceObj && dataSourceObj.color; 
+
+  const WeeKStart = parseInt(WeeKStartStr)
+  const color = dataSourceObj && dataSourceObj.color;
 
   var GDATA = window._G_DATA;
   if (!GDATA) {
@@ -86,6 +96,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         }
         GDATA['_allYear'] = d ;return d ;})
   }
+
   !(function fillData() {
     let year = "" + dateEnd.getFullYear();
     let preYear = "" + (year - 1);
@@ -133,14 +144,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
       );
     }
 
-    function idx2Ymd(idx) {
-      let t = new Date(endStamp - (DayCount - 1 - idx) * 3600000 * 24);
-      let m = t.getMonth() + 1;
-      let d = t.getDate();
-      return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${
-        d < 10 ? "0" + d : d
-      }`;
-    }
+   
 
     function updateCell(data) {
       if (!data) return;
@@ -212,6 +216,8 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         let dateKeyYmd = idx2Ymd(idxOfDay);
         let arrPostInOneDay = Map[dateKeyYmd];
 
+        
+
         let hideblock = false
         if (minYmd) {
           hideblock = dateKeyYmd < minYmd;
@@ -220,6 +226,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         let isFuture = dateKeyYmd > todayYmd;
 
         const dayCell = dayCells[idxOfDay];
+        dayCell.dataset.x = dateKeyYmd
         if (hideblock) {
           dayCell.classList = 'heatmap-day-cell hm-check-notyet'
         }else if(isFuture){
@@ -227,8 +234,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         }
         else{
           
-          const checkClassPrefix = checkPrefix || 'hm'
-          const nobg =
+           const nobg =
           parseInt(dateKeyYmd.substring(5, 7)) % 2 == 1
             ? "hm-check-no-b"
             : "hm-check-no-a";
@@ -236,10 +242,10 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
           !arrPostInOneDay
             ? nobg
             : arrPostInOneDay.length > 2
-            ?  (checkClassPrefix + "-check3")
+            ?  ("hm-check3")
             : arrPostInOneDay.length == 2 ?
-             (checkClassPrefix + "-check2") 
-            : checkClassPrefix + "-check"
+             ( "hm-check2") 
+            : "hm-check"
         }`;
 
         if (color && arrPostInOneDay && arrPostInOneDay.length) {
@@ -357,18 +363,41 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
     const monthEle = document.createElement("div");
     monthEle.className = "heatmap-month";
     Frag.appendChild(monthEle);
-    const monthStr = _MonthStr.split(" ");
+    const monthStrArr = _MonthStr.split(" ");
 
     let nowM = dateEnd.getMonth();
     let nowWeekIdx = nLastColumnCount - 1;
 
-    for (let i = 0; i < monthStr.length; i++) {
+    let monthEleArr = []
+    for (let i = 0; i < monthStrArr.length; i++) {
       let m = document.createElement("span");
       m.className = "heatmap-month-cell";
-      m.innerHTML = `${monthStr[(i + nowM + 1) % 12]}`;
+      // m.innerHTML = `${monthStr[(i + nowM + 1) % 12]}`;
       monthEle.appendChild(m);
+      monthEleArr.push(m)
+    }
+
+    /// reset month cell postion
+
+    
+    for (let index = 0 ,j = 0; index < ColumnsCount && j < monthStrArr.length; index++) {
+      const ymd = idx2Ymd(index  * 7)
+      const m = ymd.substring(5,7)
+      const d = ymd.substring(8,10)
+      
+      if (d <= '07') {
+        let ele = monthEleArr[j ++]
+        console.log(ymd,m,d)
+        ele.innerText =  monthStrArr[Number(m) - 1]
+        ele.style.gridColumnStart = index  + 1
+        ele.style.gridColumnEnd = 'span 4'
+  
+      }
     }
 
+
+
+
     const weekEle = document.createElement("div");
     weekEle.className = "heatmap-week";
     const WeekStr = _showWeek.split(" ");
@@ -397,7 +426,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         }
 
         let m = document.createElement("span");
-        m.classList = `heatmap-day-cell ${checkPrefix || "hm"}-check-nodata`;
+        m.classList = `heatmap-day-cell hm-check-nodata`;
         dayEle.appendChild(m);
       }
     }

data/_layouts/lovemap.html

@@ -17,14 +17,23 @@ layout: default
 
 
 <style>
+  .custom-map-title{
+    margin: 0;
+    font-size: 1.5em;
+    color: #444455;
+  }
+
+  .map-container{
+    padding-bottom: 4em;
+  }
   .lv-year{
-    margin-top: 2.5rem;
+    
     font-family: 'Courier New', Courier, monospace;
   }
 
   .lv-year-title{
     font-weight: bold;
-    font-size: 1.8em; 
+    font-size: 1.5em; 
     display: inline-block;
     color: #aaa;
     
@@ -56,6 +65,7 @@ layout: default
   <script >
     function create_heatmap(heatmapid,endYear,dataObj,title,count,node){
       let container =  document.createElement('div')
+      container.className = 'map-container'
       let divtitle = document.createElement('div')
       divtitle.className = 'lv-year'
 

data/_sass/heatmap.scss

@@ -24,7 +24,8 @@ $dayGap:1px;
   grid-column-end: 3;
 
   display: grid;
-  grid-template-columns: repeat(12,1fr);
+  grid-template-columns: repeat(53,4fr);
+  
 
   border: $dbgBorder;
   
@@ -34,7 +35,7 @@ $dayGap:1px;
 .heatmap-month-cell{
   display: flex;
   align-items: center;
-  justify-content: center;
+  // justify-content: center;
 
   // font-family:  $heatFont;
   font-size: 0.8rem;
@@ -42,6 +43,12 @@ $dayGap:1px;
   height: 12px;
 
   padding: 0.2em 0;
+
+
+ 
+ 
+  overflow: visible;
+  
   
 }
 
@@ -164,7 +171,7 @@ $dayGap:1px;
 $bh:2px;
 .hm-check-future-b{
   background:repeating-linear-gradient(
-    45deg,            /* 斜条纹角度 */
+    135deg,            /* 斜条纹角度 */
     #edebf0aa,          /* 第一种颜色 */
     #edebf0aa  $bh,     /* 第一种颜色的宽度 */
     #ffffff $bh ,     /* 第二种颜色的起点 */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.12
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-12 00:00:00.000000000 Z
+date: 2025-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.5
 description:
 email:
 - r