jekyll-zeta 0.7.5.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b372b1cf33d7034f355229d9f8c799a04cb27342489d30d8feb98ebf98c8f655
-  data.tar.gz: 6bc4b3b1b244d79eff1b6357ad702d5953eba90202424de955ea8af7d9eb160d
+  metadata.gz: 1936ba60486879de4de21ff2e9fa7b67a6a8488345c7ef3d3b84bb47f2a2433b
+  data.tar.gz: 4c1b68385474906261beb1a672db82b2d27ecb7a13731cdc063ccab10b50e044
 SHA512:
-  metadata.gz: d182e359bd7afb31c8fc52d21eacb9fc5f1a9fb517dcccca336e6838a738e1f90e95f8af889d18664fa2901273e484c9b2a88f1f4bd26acaf8c4411f704fa665
-  data.tar.gz: d6848200db351e369ecac4638a5f63975c23ba0220609c51890174d08ef23b26a876ffadd03ababab644240353e943f10dbbd998e12ce7bfd61f7d9269574e12
+  metadata.gz: 3d80ee99b7c683f13fca9c08757347fc5ed2fdcd7b8bf8bdeddeb9edeebfdc29e1e18cf3713c8b46ca956cf91655d886636e65945768454549416ce4cb61acf2
+  data.tar.gz: 4ed94efbfd3466987d90303b3087c6af9de12556b7f42d75ff6e564c02676a7b5948c2d6a1a83c65240a3733e40c63fe5776b8d9d2f59ef94a907c7a1da3ac44

data/_config.yml

@@ -17,6 +17,7 @@ favicon: "logo.png" # name+extension of favicon (which must be put on the root f
 
 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"
   encrypt_title: "Content is Encryped :)"

data/_includes/archive_list.html

@@ -17,11 +17,23 @@
         {%- if ymPre != "" -%}
              </ul>
         {%- endif -%}
-      {%- if yCounter == 0 -%}
-      <li class="postlistli largeli largeli0">{{ymCur}}</li> 
+
+      {% if include.showheatmap == 1 or include.showheatmap == true  %}
+         <div class=archive-map>
+         {%- include heatmap.html endYear=ymCur  title=ymCur -%}
+         </div >
       {%- else -%}
-        <li class="postlistli largeli">{{ymCur}}</li> 
-      {%- endif -%}
+        {%- if yCounter == 0 -%}
+        <li class="postlistli largeli largeli0">{{ymCur}}</li> 
+        
+        {%- else -%}
+          <li class="postlistli largeli">{{ymCur}}</li> 
+        {%- endif -%}
+      {%  endif %}
+      
+      
+
+      
       
       {%- assign yCounter = yCounter | plus:1 -%}
       <ul class="postlistul">

data/_includes/head.html

@@ -23,10 +23,8 @@
   {%- endif -%}
 
   <link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon | relative_url }}" />
-  {%- if site.theme_config.combine_css_html -%}
-  <style>
-    {%- include main.css -%}
-  </style>
+  {%- if site.theme_config.navbarPosition == 'left' -%}
+  <link rel="stylesheet" href="{{ "/assets/css/left.css" | relative_url }}" />
   {%- else -%}
   <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}" />
   {%- endif -%}

data/_includes/heatmap.html

@@ -1,18 +1,31 @@
+<div>
 {%- if include.collection -%}
   {%- assign posts = include.collection -%}  
 {%- else -%}
   {%- assign posts = site.posts -%}
 {%- endif -%}
 
-<div>
-<span class="heatmap-title">{{ heatMapTitle | site.theme_config.heatMapTitle }}</span>
-<div class='heatmap' id="heatmap">
-  
+{% if datemapidOnPage == nil %}
+    {%- assign  datemapidOnPage = 0 -%}
+{%- else -%}
+    {%- assign  datemapidOnPage = datemapidOnPage  |  plus : 1-%}
+    
+{%- endif -%}
 
+
+{% assign mapEleId = "heatmap-" | append: datemapidOnPage %}
+<div class="heatmap-title">{{ include.title | default :""  }}</div>
+
+<div class='heatmap' id="{{mapEleId}}">
+  
 </div>
-</div>
+{%- if datemapidOnPage == 0 -%}
+
+{% comment %}
+  只加载一次
+{% endcomment %}
 <script >
-  (function(){
+  function create_heatmap(heatmapid,endYear){
 
     {%- assign MothStr = site.theme_config.heatMapMonth  -%}
     {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
@@ -26,8 +39,24 @@
     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" }}';
-
     var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
-    {% include heatmap.js %}
-  })()
+    {% include heatmap.js  %}
+  }
+</script>
+
+{% else %}
+
+{%- endif -%}
+
+
+{{child_initialized}}
+
+<script> 
+!function(){
+  var endYear = "{{ include.endYear }}"
+  var mapid = "{{ mapEleId }}"
+  create_heatmap(mapid,endYear )
+}()
 </script>
+
+</div>

data/_includes/heatmap.js

@@ -1,3 +1,5 @@
+
+
 ;!function(){
 
 function date2ymd(t){
@@ -6,8 +8,8 @@ function date2ymd(t){
   return `${t.getFullYear()}-${m< 10 ? '0' + m : m }-${d<10 ? '0'+d:d}`
 }
 
+const dateEnd = endYear && endYear.length == 4 ? new Date(`${endYear}-12-31`) : new Date();
 
-const dateEnd = new Date();
 const  endStamp = dateEnd.getTime()
 const dayEleId = Math.random().toString(16).substring(2);
 let arr = _allyearurl.split('/');
@@ -141,23 +143,13 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
         return
       }
       const idxOfDay = SEQ[G_idxOfDay --];
-      
       let dateKeyYmd = idx2Ymd(idxOfDay )
-
-
       let  arrPostInOneDay = Map[dateKeyYmd];
-      // debug
-      arrPostInOneDay = arrPostInOneDay 
-
-
       const dayCell = dayCells[idxOfDay]
       const nobg = parseInt(dateKeyYmd.substring(5,7))%2  == 1? 'hm-check-no-b' : 'hm-check-no-a';
       dayCell.classList = `heatmap-day-cell ${!arrPostInOneDay ? nobg :arrPostInOneDay.length > 1 ? 'hm-check2' : 'hm-check' }`  
 
-      
       if ((arrPostInOneDay && arrPostInOneDay.length > 0 )) {
-
-
         let isDirectly = arrPostInOneDay.length == 1
         let tip = document.createElement("div");
 
@@ -197,6 +189,9 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
 
     function updateMultiDays(){
       let day = heatMapLoadCount;
+      if (!day || day <= 0) {
+        day = 8;
+      }
       while (day -- ) {
         update1Day();
       }
@@ -209,11 +204,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
     requestAnimationFrame(updateMultiDays)
     
     return
- 
- 
-    
-
-
+  
   }
 
    
@@ -236,7 +227,7 @@ const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
 
 ;(function initMap(){
 
-let Father = document.getElementById("heatmap");
+let Father = document.getElementById(heatmapid);
 
 const Frag = document.createDocumentFragment();
 
@@ -302,6 +293,4 @@ Father.append(Frag);
 
 
 
-}();
-
-
+}();

data/_includes/home.html

@@ -1,13 +1,12 @@
-
-
- 
-{%- include heatmap.html -%}
- 
-
 {%- assign titlelen = page.title.size -%}
 {%- if titlelen > 0 -%}
 <h2>{{ page.title }}</h2>
 {%- endif -%}
+
+{%- include heatmap.html -%}
+ 
+
+
 {%-assign nextPage = site.paginate_path | replace: ':num', '2' -%}
 
 

data/_includes/navbar_left.html

@@ -0,0 +1,39 @@
+<div class="sidebar">
+<div class="sidecontent">
+{%- capture currentUrl -%}{{ page.url | relative_url}}{%- endcapture %}
+<img src="{{'assets/image/avartar.png' | relative_url }}"  class="avatar"/> 
+
+
+<nav>
+  <ul class="navul">
+    {%-for item in site.theme_config.menu %}
+
+      {%- if item.url -%}
+        {%- capture itemurl -%}{{ item.url | relative_url}}{%- endcapture -%}
+        
+      {%- assign iscurrent= false %}
+      {%- if currentUrl == itemurl -%}
+            {%- assign iscurrent= true %}
+      {%- else -%}
+            {%- for subpath in item.subpath %}
+               {%- if currentUrl contains subpath %}
+                  {%- assign iscurrent= true %}
+                  {%- break %}
+              {%- endif  %}
+            {%- endfor %}
+      {%- endif %}
+      <li class="{% if iscurrent  == true -%}navli curNav{%-else -%}navli{%- endif -%}">
+
+      <a href="{{ itemurl }}" class="nav">{{ item.title }}</a>
+        
+      {%- else -%}
+        {{ item.title }}
+      {%- endif -%}
+      </li>
+    {%-endfor-%}
+  </ul>
+</nav>
+
+
+</div>
+</div>

data/_includes/page_frame_left.html

@@ -0,0 +1,20 @@
+<header>
+    {%- include navbar_left.html -%}
+</header>
+<section class="rightsidecontent">
+<div class="w">
+    
+    {{ content }} 
+
+    {%- assign footnote = site.theme_config.show_footnote  -%}
+    {%- if footnote == true   -%}
+    
+     <footer class="footer">
+      <p> Powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://github.com/vitock/jekyll-zeta">Jekyll-zeta</a>
+     </p>
+    </footer>
+    {%- endif -%}
+
+ 
+</div>
+</section>

data/_layouts/archive.html

@@ -3,18 +3,18 @@ layout: default
 ---
 
 
-{%- if page.heatmap -%}
-{%- include heatmap.html -%}
-{%- endif -%}
 {%- assign titlelen = page.title.size -%}
 {%- if titlelen > 0 -%}
 <!-- <h2>{{ page.title }}</h2> -->
 {%- endif -%}
 
 {%-assign posts = site.posts-%}
+
 {%- if posts.size > 0 -%}
   {%- include archive_list.html
     collection=posts
+
+    showheatmap = page.heatmap
   -%}
 {%- endif -%}
 

data/_layouts/default.html

@@ -3,7 +3,10 @@
   {%- include head.html -%}
   <body a="{{ site.theme_config.appearance | default: "auto" }}">
     <main class="page-content" aria-label="Content">
-      
+
+      {%- if site.theme_config.navbarPosition == 'left' -%}
+        {%- include page_frame_left.html  -%}
+      {%- else  -%}
       <div class="w">
         {%- include navbar.html -%}
         {{ content }}
@@ -16,6 +19,9 @@
         </footer>
         {%- endif -%}
       </div>
+      {%- endif -%}
+      
+     
     </main>
 
     {%-if site.goat_counter and jekyll.environment == "production"-%}

data/_layouts/heatmap.html

@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-<link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}" />
+
 <br/><br/><br/>
 {%- include heatmap.html -%}
  

data/_sass/common.scss

@@ -0,0 +1,336 @@
+
+$color-red: #FF0000;
+$color-black: #333;
+$color-blue: #0064c1;
+$color-hove: #0064c1;
+$color-gray: #9ca3af;
+$color-lightGray: #9ca3af;
+$color-lightGrayBg: #F0f2f4;
+
+$dbgBorder:none;//ssolid 1px red;
+
+
+
+
+// $hmbloksizeW:11px;
+
+li {
+    padding: 0.2rem;
+  }
+  
+  main{
+    margin:  2.5em 0;
+  }
+  body{
+    font-family: monospace;
+    font-size: 1.15rem;
+    // background-color: #fafafa;
+    margin: 0;
+  
+    // &::before{
+    //   content: "";
+    //   position: fixed;
+    //   left: 0;
+    //   right: 0;
+    //   top: 0;
+    //   bottom: 0;
+   
+    //   // background-image: url(../image/bg-2.png)  ;
+    //   // background-color: #fffef8   ;//#fffef9;
+    //   z-index: -1;
+    //   // filter: grayscale(0.8);
+    //   // opacity: 0.9;
+    // }
+  }
+  
+  article{
+    line-height: 1.6;
+  }
+  .w {
+    margin: auto;
+    word-wrap: break-word;
+    background-color: white;
+    // box-shadow: 0 2px 3px 0 #eee
+  }
+  
+  code.highlighter-rouge {
+    color: $color-black;
+    background: $color-lightGrayBg;
+    border-radius: 5px;
+    padding: 0 5px;
+    margin: 5px;
+  }
+  
+  code {
+    color: $color-black;
+    background: $color-lightGrayBg;;
+    max-height: 35rem;
+  }
+  
+  div.highlighter-rouge code {
+    border-radius: 10px;
+    display: block;
+    overflow: auto;
+    padding: 1rem;
+  }
+  
+  img {
+    width: 60%;
+    display: block;
+    margin: 0 auto;
+  }
+  
+  blockquote {
+    font-style: italic;
+    border-left: 5px solid #22a2c3;
+    border-radius: 5px;
+    color: #999;
+    // padding: 2rem 0.25rem .25rem 0.25rem;
+    padding: 0.3rem 1rem;
+    margin: 1rem 0;
+    background-color: $color-lightGrayBg;
+  
+    
+    // &::before{
+    //   content: "";
+    //   display: block;
+    //   background: url(../image/quote.svg) no-repeat 50% 50%;
+    //   width: 27px;
+    //   height: 20px;
+    //   position: absolute;
+    //   z-index: 1;
+  
+    //   margin-left: -10px;
+    //   margin-top: -24px;
+    //   opacity: 0.1;
+      
+    // }
+  }
+  
+  blockquote p {
+    margin: 0
+  }
+  
+  table {
+    width: 100%;
+  }
+  table{
+    box-shadow: 0px 0px 5px #e0e0e0;
+  }
+  th{
+    background-color: #f5f5f5;
+  }
+  table,
+  th,
+  td {
+    border: thin solid #e0e0e0;
+    border-collapse: collapse;
+    padding: 0.4em 1em ;
+  }
+  tr:nth-child(even){
+    background-color: #f5f5f5;
+  }
+  
+  // hr {
+  //   margin-top: 2rem;
+  //   margin-bottom: 2rem;
+    
+  
+  //   border: 0;
+  //   padding: 3px;
+  
+  //   background: repeating-linear-gradient(135deg, #000 0px, #000 1px, transparent 1px, transparent 5px);
+  // }
+  
+  hr{
+    margin: 2rem 0;
+    border:none;
+    text-align: center;
+    color: $color-gray;
+    border-bottom: $color-lightGray dashed 1px;
+  }
+    
+  
+  a {
+    text-decoration: none;
+    color: $color-blue;
+  }
+  
+  
+  .w > h1>a {
+    color: $color-black;
+  }
+  
+  .w > h1>a:hover {
+    color: $color-black;
+  }
+  
+   
+  nav{
+    /* 这个只是固定在页面上面 */
+    position: relative;
+    align-content: center;
+ }
+   
+  .navul {
+    padding: 0;
+    display: flex;
+    font-weight: 700;
+    align-items: center;
+  }
+  
+  .navli {
+    list-style-type: none;
+    margin-right: 1rem;
+    font-size: 1.125rem;
+  }
+   
+  .postlistul {
+    padding: 0
+  }
+  
+  .postlistli {
+    list-style-type: none;
+    display: flex;
+    align-items: first baseline;
+    padding: 5px 0;
+  
+  }
+  
+  .postlistli  a,.pagebar a ,.tags-tag{
+    color: #000;
+  }
+   
+  span.next{
+    color: #c3c3c3;
+  }
+    
+  date  {
+    color: $color-lightGray;
+    font-size: 0.9em;
+    margin-right: 1em;
+  }
+   
+  time {
+    color: $color-lightGray;
+    font-weight: 500;
+  }
+  .tag {
+    color: $color-lightGray;
+    font-weight: 500;
+  }
+  
+  
+  
+  .pagebar {
+    margin-top: 2rem;
+    display: flex;
+    // float: right;
+    align-items: baseline;
+  }
+  
+  .page_number {
+    color: $color-black;
+    padding-left: 10px;
+    padding-right: 10px;
+    text-align: center;
+  }
+  
+  .largeli {
+    font-weight: bolder;
+    color: $color-black;
+    font-size: 1.6rem;
+    padding: 2.25rem 1rem 0.5rem 0;
+  }
+  
+  .largeli0 {
+    padding: 0 0 0.5rem 0;
+  }
+  
+  .footer{
+    margin-top: 4rem;
+    color: #aaa;
+    width: 100%;
+    font-size: 0.9rem;
+    text-align: center;
+  }
+  
+  .footer a {
+    color: #808080;
+  }
+  
+  a:hover {
+    text-decoration: underline;
+    color:$color-hove;
+  }
+  
+  .curNav > .nav{
+
+
+    color: #55bb8a;
+  }
+  
+  .nav{
+    color: $color-black;
+  }
+  
+  input[type="button"]{
+    /* 设置按钮的背景色，字体样式等 */
+    background-color: #e0e0e0;
+    border: none;
+    color: $color-black;
+    padding: 5px 12px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 0.8em;
+   
+    cursor: pointer;
+    border-radius: 3px;
+    /* 鼠标悬停时改变按钮颜色 */
+  }
+  input[type="button"]:hover{
+    background-color: $color-black;
+    color: white;
+  }
+  
+    
+  pre{
+    white-space: pre-wrap; /* 保留空白字符，但是允许自动换行 */
+    overflow-wrap: break-word; /* 在单词内允许换行 */
+  }
+  
+  pre>code{
+    background-color: #1e131eff;
+    color: #e7e7b1;
+    box-shadow: 0px 0px 8px   #000;
+  }
+  
+  pre>code::before {
+    content: url('../image/dots.svg');
+    display: block;  
+    margin-top:-1rem;
+  }
+   
+  
+  img{
+    max-width: 80%;
+  
+  }
+  
+.iconchar{
+    margin-left: 10px;
+    // filter: grayscale(0.1) brightness(0.6);
+    font-size: 0.6em;
+}
+  
+
+.archive-map{
+  padding-bottom: 1rem;
+}
+
+
+.avatar{
+  width: 76px;
+  height: 76px;
+}