jekyll-zeta 0.9.2.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e405b59f92ae84c230b89c0b4332f2af75f29c86535a8dd94f7a39b459cc7ac
-  data.tar.gz: 4d50362dfe930d434e7034afd678c162f50862c3e328811b141d2c659527010a
+  metadata.gz: 1d4d3142d6ad3ca6ddc2f2d08b4d8cbf2f2ad9ce1a9b19d64fc56846d4f6f004
+  data.tar.gz: '097c90e559ec81e4a7be05a0205808964545f25fa9f30d737bc02d982314e280'
 SHA512:
-  metadata.gz: 6d89fa3098eecfb38363b85612be836a8cc9d9839faf79d420e688d7e6d379f5d41bbf702c422e4b1a23a6a7880a520561ac218f0d822d4e9e84e84905475ee6
-  data.tar.gz: 911d39d2ec33e4d076557a9231402e921fbf4e3b8f4072e9d7ce5f08325ad2ac84203f77c7cccdcf90f8ad4fa108768c6da012cdb2538977d94d37f05c1764da
+  metadata.gz: bb98e6a641ecca04312fb953b6496d3c29377f2d82eae6bbedead1db3b807aeb622f87267094bb2361e50e1a3666c3d4ebf22f6bec2aa5b2e80b8c846747df7e
+  data.tar.gz: ee9da8835f8c70bf16e95336f9076d95ca58a233131072e04b2796ab795af9f55594645002c838a9409f1c7602c2618e1dd4c79a07151d6edeb07bb1df809d79

data/_config.yml

@@ -19,9 +19,9 @@ theme_config:
   appearance: "auto" # can be "light", "dark" or "auto"
   navbarPosition: left # left or top
   date_format: "%m/%d" # customize how date is formatted
-  post_date_format: "%Y/%m/%d"
+  post_date_format: "%Y/%m/%d %a"
   encrypt_title: "Content is Encryped :)"
-  # encrypt_clear_btn: "清空缓存密码"
+  # encrypt_clear_btn: "清空缓存密码"A
   # decrypt_btn: 解密
   # encrypt_btn: 重新加密
   tag_showall: true

data/_includes/heatmap.html

@@ -29,16 +29,13 @@
 
     {%- assign MothStr = site.theme_config.heatMapMonth  -%}
     {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
-
-    {%- assign HeatMapType = site.theme_config.heatMapType  -%}
-
     {%- assign heatMapLoadCount = site.theme_config.heatMapLoadCount | default: 8  -%}
     
+    const WeeKStartStr = "{{ site.theme_config.heatMapWeekStart | default: 0 }}" ;//  0 sunday 1 monday 2. tuesday ...
 
-    const heatMapLoadCount = {{heatMapLoadCount}}
-    var _HeatMapType = "{{ HeatMapType | default:'1' }}"
-    var _MonthStr =  '{{ MothnStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}'
-    var _showWeek =  '{{ HeatMapShowWeek | default: "Mon Wed Fri" }}';
+    const heatMapLoadCount = {{heatMapLoadCount}};
+    var _MonthStr =  '{{ MothnStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}';
+    var _showWeek =  '{{ HeatMapShowWeek | default: "Sun Mon Tue Wed Thu Fri Sat" }}';
     var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
     {% include heatmap.js  %}
   }

data/_includes/heatmap.js

@@ -1,4 +1,7 @@
 ;!(function () {
+  
+  const WeeKStart = parseInt(WeeKStartStr)
+
 
   var GDATA = window._G_DATA;
   if (!GDATA) {
@@ -22,9 +25,10 @@
   arr.pop();
   const jsonUrlBase = arr.join("/");
 
+  const nLastColumnCount = (dateEnd.getDay() -  WeeKStart + 7) % 7 + 1
   const ColumnsCount = 53;
   const RowCount = 7;
-  const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
+  const DayCount = (ColumnsCount - 1) * RowCount + nLastColumnCount;
 
   let queue  = window._y_queue || []
   window._y_queue = queue;
@@ -301,7 +305,7 @@
     const monthStr = _MonthStr.split(" ");
 
     let nowM = dateEnd.getMonth();
-    let nowWeek = dateEnd.getDay();
+    let nowWeekIdx = nLastColumnCount - 1;
 
     for (let i = 0; i < monthStr.length; i++) {
       let m = document.createElement("span");
@@ -315,9 +319,10 @@
     const WeekStr = _showWeek.split(" ");
 
     for (let i = 0; i < WeekStr.length; i++) {
+      const idx = (i + WeeKStart) % 7
       let m = document.createElement("div");
       m.className = "heatmap-week-cell";
-      m.innerHTML = `<span>${WeekStr[i]}</span>`;
+      m.innerHTML = i % 2  ?  `<span>${WeekStr[idx]}</span>` : ''
       weekEle.appendChild(m);
     }
 
@@ -328,13 +333,11 @@
     dayEle.className = "heatmap-day";
     dayEle.id = dayEleId;
 
-    let firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
-
-    // console.log(nowWeek, firstDateDayDiff);
+    // console.log(nowWeekIdx, firstDateDayDiff);
 
     for (let c = 0; c < ColumnsCount; c++) {
       for (let r = 0; r < RowCount; r++) {
-        if (r > nowWeek && c == ColumnsCount - 1) {
+        if (r > nowWeekIdx && c == ColumnsCount - 1) {
           break;
         }
 

data/_sass/heatmap.scss

@@ -65,7 +65,9 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   justify-content: center;
   padding-right: 0.2em;
   font-size: 0.8rem;
-  font-family:  $heatFont
+  font-family:  $heatFont;
+  line-height: $hmbloksizeH;
+  height: $hmbloksizeH;
 }
 
 .heatmap-day{

data/_sass/jekyll-zeta-left.scss

@@ -1,7 +1,7 @@
 @import "common";
 @import "heatmap";
 
-$mobileWidth:500px;
+$mobileWidth:567px;
 
 .nav-title{
   color: $color-black;
@@ -12,16 +12,17 @@ $mobileWidth:500px;
  
 .nav-title:hover{
   color:$color-hove;
+  text-align: center;
 }
 
 // pc
 @media only screen and (min-width: #{$mobileWidth}) {
-
-
-
 .avatar-title{
+  display: flex;
+  flex-direction: column;
   align-items: center;
   padding: 1rem 0 1rem 0;
+  justify-content: center;
 }
 
   $contentWidth: 52rem;
@@ -99,10 +100,13 @@ $mobileWidth:500px;
   }
 
 
-.avatar-title{
-  display: flex;
-  align-items: center;
-}
+  .avatar-title{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 1rem 0 1rem 0;
+    justify-content: center;
+  }
   
 
   .w {

metadata

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