jekyll-theme-hamilton 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5044574bcedfda1f8b3a42493f85c31b6d167a0a30a9e241a57c8f83d4816d9
-  data.tar.gz: a4970e2123b9c0688cc5f9761fa7dde11e192106ae3c30a16f2d3c49bdfc0df3
+  metadata.gz: 46fd3f729c41827bf6afb663b5acd694ff14cc220f1ecbbb583762027e1208fd
+  data.tar.gz: a18e3b2d66dc8522371a2a1c3389436722efb52af4397ae7bb11f46c9327162e
 SHA512:
-  metadata.gz: 8783df54ceff357bb91daf4650f1e8cbea70f7023920b03055c45107872a68c22b57cfefeaa8362dbc8ae69622944fa5ed7903ab2c05dd6504a70937a387ed0b
-  data.tar.gz: eccebc22431392658371b9920f1c0fc87b462c3485557abca4935c70d0e5b56cead1a1ab1df1954b47b1416e990ed67a23ff6f296aa091a97b590ab1156c02af
+  metadata.gz: 3b30f118f6a6acecc6bcb33afeb0a5fea7084b1ef9e0b2cf880f2e4a1501bdebcc2a75da12f7db7a45eb53f37b75446ec3ffbb61eae6b7aad46d87986ca94d03
+  data.tar.gz: beacf8e15ef777f7000e0915ce45a709aa3ce1174ba5bee18093c975059a25bb5838c3aad9babd134a30765355601e9bcb47134850939781c1036bbba40d804a

data/README.md

@@ -6,9 +6,11 @@ The original purpose of this theme is to be a replacement of the default Jekyll
 
 Please check out the [demo](https://ngzhio.github.io/jekyll-theme-hamilton/).
 
-| Daylight | Sunrise/Sunset | Midnight |
-| --- | --- | --- |
-| ![screenshot](screenshot.png) | ![screenshot](screenshot-sunrise.png) | ![screenshot](screenshot-midnight.png)
+| Skins | Displays |
+| ----- | -------- |
+| Daylight | ![screenshot](screenshot.png) |
+| Sunrise/Sunset | ![screenshot](screenshot-sunrise.png) |
+| Midnight | ![screenshot](screenshot-midnight.png) |
 
 ## Features <!-- omit in toc -->
 
@@ -62,7 +64,7 @@ You can choose one of the following methods to install Hamilton:
         plugins:
           - jekyll-remote-theme
 
-        remote-theme: ngzhio/jekyll-theme-hamilton
+        remote_theme: ngzhio/jekyll-theme-hamilton
         ```
 
 ## Configuration
@@ -82,6 +84,7 @@ After installation, you can run `jekyll serve` to check out your site, but befor
 | `author`   | string | The name of the author of the site; It would be showed in the copyright statement. |
 | `avatar`   | string | The avatar of the author of the site. |
 | `email`    | string | The email of the author of the site. |
+| `location` | string | The current living location of the author of the site. |
 | `skin`     | string | The skin name. See more information on the [Customization](#customization) section. |
 | `lang`     | string | The language of the site; The default value is `en`. |
 | `paginate` | int    | The number of posts on each page. |

data/_includes/head.html

@@ -15,7 +15,7 @@
 {% endif %}
 
 <!-- Google Fonts -->
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto|Roboto%20Slab|Roboto%20Mono|Lobster|Dancing%20Script|Noto%20Sans%20SC|Noto%20Sans%20TC|Noto%20Serif%20SC|Noto%20Serif%20TC|ZCOOL%20QingKe%20HuangYou|Ma%20Shan%20Zheng">
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open%20Sans|Roboto|Roboto%20Slab|Roboto%20Mono|Dancing%20Script|Noto%20Sans%20SC|Noto%20Sans%20TC|Noto%20Serif%20SC|Noto%20Serif%20TC|Ma%20Shan%20Zheng">
 
 <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 <link rel="stylesheet" href="{{ '/assets/css/skin.css' | relative_url }}">

data/_includes/sidebar.html

@@ -12,10 +12,22 @@
 <div class="sidebar-section">
   <ul class="contact-list">
     {% if site.author -%}
-      <li class="p-name"><i class="sidebar-icon fas fa-at"></i><span>{{ site.author | escape }}</span></li>
+      <li>
+        <i class="sidebar-icon fas fa-at"></i>
+        <span class="contact-info p-name">{{ site.author | escape }}</span>
+      </li>
     {%- endif %}
     {% if site.email -%}
-      <li><a class="u-email" href="mailto:{{ site.email }}"><i class="sidebar-icon fas fa-envelope"></i><span>{{ site.email }}</span></a></li>
+      <li>
+        <i class="sidebar-icon fas fa-envelope"></i>
+        <a class="contact-info u-email" href="mailto:{{ site.email }}">{{ site.email }}</a>
+      </li>
+    {%- endif %}
+    {% if site.location -%}
+      <li>
+        <i class="sidebar-icon fas fa-location-arrow"></i>
+        <a class="contact-info u-location" href="https://www.google.com/maps/search/{{ site.location }}">{{ site.location }}</a>
+      </li>
     {%- endif %}
   </ul>
 </div>

data/_layouts/home.html

@@ -22,7 +22,16 @@ layout: default
             {{ post.title | escape }}
           </a>
         </h2>
-        <span class="post-meta">{{ post.date | date: date_format }}</span>
+        <p class="post-meta">
+          <time class="dt-published" datetime="{{ post.date | date_to_xmlschema }}" itemprop="datePublished">
+            {{ post.date | date: date_format }}
+          </time>
+          {%- if jekyll.environment == "production" and site.disqus -%}
+            • <a href="{{ post.url | relative_url }}#disqus_thread">
+                <span class="disqus-comment-count" data-disqus-url="{{ post.url | absolute_url }}"></span>
+              </a>
+          {%- endif -%}
+        </p>
         {%- if post.show_excerpts != false -%}
           <div class="post-excerpt">{{ post.excerpt | strip_html }}</div>
         {%- endif -%}
@@ -49,5 +58,8 @@ layout: default
     {%- endif %}
 
   {%- endif -%}
-
+  
+  {%- if jekyll.environment == "production" and site.disqus -%}
+    <script id="dsq-count-scr" src="//{{ site.disqus }}.disqus.com/count.js" async></script>
+  {%- endif -%}
 </div>

data/_layouts/post.html

@@ -12,9 +12,9 @@ layout: default
       <time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
         {{ page.date | date: date_format }}
       </time>
-      {%- if page.modified_date -%}
+      {%- if page.last_modified_at -%}
         ~ 
-        {%- assign mdate = page.modified_date | date_to_xmlschema -%}
+        {%- assign mdate = page.last_modified_at | date_to_xmlschema -%}
         <time class="dt-modified" datetime="{{ mdate }}" itemprop="dateModified">
           {{ mdate | date: date_format }}
         </time>
@@ -80,7 +80,7 @@ layout: default
     </nav>
   </footer>
 
-  {% if page.comments != false and jekyll.environment == "production" %}
+  {% if page.comments != false and jekyll.environment == "production" and site.disqus %}
     {% include disqus.html %}
   {% endif %}
   

data/_sass/hamilton/base.scss

@@ -83,10 +83,6 @@ li {
   > ol {
     margin-bottom: 0;
   }
-
-  p, blockquote, pre, figure, iframe, %vertical-rhythm {
-    margin-bottom: $spacing-unit / 3;
-  }
 }
 
 /**
@@ -123,11 +119,12 @@ blockquote {
 pre,
 code {
   font-family: $code-font-family;
+  letter-spacing: -1px;
   border-radius: 0.3em;
 }
 
 code {
-  padding: 1px 5px;
+  padding: 0px 5px;
 }
 
 pre {
@@ -181,7 +178,7 @@ ul.task-list {
     list-style-type: none;
 
     .task-list-item-checkbox {
-      margin: 0 .2em .25em -1.6em;
+      margin: 0 .5em .25em -1.6em;
       vertical-align: middle;
     }
   }

data/_sass/hamilton/layout.scss

@@ -238,10 +238,16 @@
   text-align: left;
 }
 
-.contact-list {
+ul.contact-list {
   list-style: none;
   margin-left: 0;
   margin-bottom: 0;
+
+  li {
+    overflow: hidden; 
+    white-space: nowrap; 
+    text-overflow: ellipsis; 
+  }
 }
 
 ul.social-icons {
@@ -256,7 +262,7 @@ ul.social-icons {
 }
 
 .author-avatar {
-  width: $base-font-size * 9;
+  width: $base-font-size * 8;
   height: auto;
   border-radius: 50%;
 }
@@ -299,6 +305,7 @@ ul.social-icons {
 }
 
 .post-list {
+  font-family: $headline-font-family;
   margin-left: 0;
   padding-left: 0;
   list-style: none;
@@ -419,8 +426,8 @@ ul.post-categories {
 // About font sizes for h1-h6, refer to https://stackoverflow.com/a/6140504/13261366
 .post-title,
 .post-content h1 {
-  font-family: $display-font-family;
   @include relative-font-size(1.8);
+  font-family: $headline-font-family;
   font-weight: bold;
   letter-spacing: -1px;
   line-height: $base-line-height * $base-font-size * 2;
@@ -435,12 +442,12 @@ ul.post-categories {
   margin-bottom: $spacing-unit;
 
   h2, h3, h4, h5, h6 {
-    font-family: $base-font-family;
+    font-family: $headline-font-family;
   }
 
-  h2     { margin-top: $spacing-unit * 2 }
-  h3, h4 { margin-top: $spacing-unit * 1.5 }
-  h5, h6 { margin-top: $spacing-unit }
+  h2         { margin-top: $spacing-unit * 2 }
+  h3         { margin-top: $spacing-unit * 1.5 }
+  h4, h5, h6 { margin-top: $spacing-unit }
 
   h2 {
     @include relative-font-size(1.4);
@@ -465,6 +472,19 @@ ul.post-categories {
   h6 {
     @include relative-font-size(0.75);
   }
+
+  li {
+    margin-bottom: $spacing-unit / 3;
+
+    > ul,
+    > ol {
+      margin-top: $spacing-unit / 3;
+    }
+
+    p, blockquote, pre, figure, iframe, %vertical-rhythm {
+      margin-bottom: $spacing-unit / 3;
+    }
+  }
 }
 
 /**

data/_sass/hamilton/variables.scss

@@ -1,16 +1,16 @@
 // Fonts
-$base-font-family:  Roboto, "Noto Sans SC", "Noto Sans TC" !default;
+$base-font-family: "Open Sans" !default;
 $reading-font-family: "Roboto Slab", "Noto Serif SC", "Noto Serif TC" !default;
+$headline-font-family: Roboto, "Noto Sans SC", "Noto Sans TC" !default;
 $code-font-family:  "Roboto Mono" !default;
-$display-font-family: Lobster, "ZCOOL QingKe HuangYou" !default;
 $handwriting-font-family: "Dancing Script", "Ma Shan Zheng" !default;
-$base-font-size:    18px !default;
-$base-line-height:  1.4 !default;
+$base-font-size:    16px !default;
+$base-line-height:  1.5 !default;
 
 // Layouts
 $spacing-unit:      2rem !default;
-$content-width:     1200px !default;
+$content-width:     1000px !default;
 
 $on-small:          600px !default;
-$on-medium:         900px !default;
-$on-large:          1200px !default;
+$on-medium:         800px !default;
+$on-large:          1000px !default;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-hamilton
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Shangzhi Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll