jekyll-theme-hamilton 1.4.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c7ba52644a1de4f49df82c4a8137e0e73e2a6113c969bee996501f8054ad206
-  data.tar.gz: 320198c139ab3193443f4f5746eda02d31a6d6e3e759419be66d66d8eab21058
+  metadata.gz: 918cbb51402f2cc6a02a9e8fae490614184e267fcc163f24beceb99f2e50efe6
+  data.tar.gz: 4978858b0bef6cb18d658cd3ff2f0af380cd9938af66292f164160fd1920473b
 SHA512:
-  metadata.gz: 19fafeea368e6e2d1984ddf4c203415ce1834c814d65fb48f44a5aef2c89320f7e7c27149bf450b1521b44634b0ae470fb762237c4ad1e068e00a06a4f02eae5
-  data.tar.gz: d4754deb6fb09c618f14977339f4eb2871943da5cdc7f1ee8d837707fec2b5739cc4812cb3b449921e09539e9f7a6e78a7ff940dbbdb701289e5cc252ea15943
+  metadata.gz: cdbe0d25fb6e15d6ef2bde21659ac56f10a7b3e9d4212ee3c05a39ffffb1ec22149067563b5bf34ec95a8e3c4c2745a29aede496689f174a8614681dd0451352
+  data.tar.gz: 17558ee6336979f3c4004ad7bde998f4228e1891835a77ac785375ba1886eb61211a3ea033a0f39d02acd58c7b4dc6f75b899678b905d0cb0f2610d23ab9d4a7

data/_includes/head.html

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

data/_layouts/post.html

@@ -28,26 +28,46 @@ layout: default
       {%- endif -%}
     </p>
 
-    {% if page.tags.size > 0 %}
-      <p class="post-meta post-tags">
-        {% assign tags = page.tags | sort %}
-        {% for tag in tags %}
-          <span class="post-tag">
-            {% assign slugified_tag = tag | slugify %}
-            <a href="{{ '/tags/#:tag' | replace: ':tag', slugified_tag | relative_url }}">#{{ slugified_tag }}</a>
-          </span>
-        {% endfor %}
-      </p>
-    {% endif %}
-
   </header>
 
   <div class="post-content e-content" itemprop="articleBody">
     {{ content }}
+  </div>
 
-    {% if page.comments != false and jekyll.environment == "production" %}
-      {% include disqus.html %}
+  <footer class="post-footer">
+    {% if page.categories.size > 0 %}
+      <div class="post-meta">
+        <i class="fas fa-folder"></i>
+        <ul class="post-taxonomies post-categories">
+          {% assign categories = page.categories | sort %}
+          {% for category in categories %}
+            <li class="post-category">
+              {% assign slugified_category = category | slugify %}
+              <a href="{{ '/categories/#:category' | replace: ':category', slugified_category | relative_url }}">{{ category }}</a>
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
     {% endif %}
-  </div>
+
+    {% if page.tags.size > 0 %}
+      <div class="post-meta">
+        <i class="fas fa-tags"></i>
+        <ul class="post-taxonomies post-tags">
+          {% assign tags = page.tags | sort %}
+          {% for tag in tags %}
+            <li class="post-tag">
+              {% assign slugified_tag = tag | slugify %}
+              <a href="{{ '/tags/#:tag' | replace: ':tag', slugified_tag | relative_url }}">{{ slugified_tag }}</a>
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+  </footer>
+
+  {% if page.comments != false and jekyll.environment == "production" %}
+    {% include disqus.html %}
+  {% endif %}
   
 </article>

data/_sass/hamilton/layout.scss

@@ -41,7 +41,7 @@
 
 .site-title {
   @include relative-font-size(1.625);
-  font-family: $title-font-family;
+  font-family: $handwriting-font-family;
   letter-spacing: -1px;
   margin-bottom: 0;
   float: left;
@@ -182,7 +182,7 @@
  */
 .site-body {
   display: grid;
-  grid-template-columns: calc(#{$content-width} * 0.2) 1fr;
+  grid-template-columns: calc(#{$content-width} * 0.22) 1fr;
   overflow: hidden;
 
   @include media-query($on-medium) {
@@ -198,11 +198,12 @@
  * Site sidebar
  */
 .site-sidebar {
-  padding: $spacing-unit / 2;
+  padding: $spacing-unit;
   border-right: 1px solid;
   @include relative-font-size(0.8);
 
   @include media-query($on-medium) {
+    padding: $spacing-unit / 2;
     @include relative-font-size(0.6);
   }
 
@@ -244,14 +245,13 @@
   margin-bottom: 0;
 }
 
-.social-icons {
+ul.social-icons {
   list-style: none;
   margin-left: 0;
   margin-bottom: 0;
-  text-align: left;
-  display: flex;
 
-  .social-icon {
+  > li {
+    display: inline-block;
     margin: 0.3em;
   }
 }
@@ -273,8 +273,13 @@
   -ms-overflow-style: none;  // IE and Edge
   scrollbar-width: none;     // Firefox
 
-  padding-left: $spacing-unit / 2;
-  padding-right: $spacing-unit / 2;
+  padding-left: $spacing-unit;
+  padding-right: $spacing-unit;
+
+  @include media-query($on-medium) {
+    padding-left: $spacing-unit / 2;
+    padding-right: $spacing-unit / 2;
+  }
 
   @include media-query($on-small) {
     padding-left: 0;
@@ -307,6 +312,11 @@
 
     h2 {
       margin-bottom: 0;
+      @include relative-font-size(1.4);
+
+      @media screen and (min-width: $on-large) {
+        @include relative-font-size(1.5);
+      }
     }
 
     .post-excerpt {
@@ -319,14 +329,6 @@
   }
 }
 
-.post-link {
-  @include relative-font-size(1.5);
-
-  @media screen and (min-width: $on-large) {
-    @include relative-font-size(1.55);
-  }
-}
-
 /**
  * Pagination
  */
@@ -358,7 +360,7 @@
  */
 .post-header {
   padding-top: $spacing-unit * 2;
-  padding-bottom: $spacing-unit / 2;
+  padding-bottom: $spacing-unit;
   border-bottom: 1px solid;
   margin-bottom: $spacing-unit * 2;
   text-align: center;
@@ -369,13 +371,34 @@
   margin-bottom: $spacing-unit / 2;
 }
 
-.post-tags {
-  .post-tag {
-    margin-right: $spacing-unit / 2;
+.post-footer {
+  padding-top: $spacing-unit / 2;
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+
+ul.post-taxonomies {
+  list-style: none;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 0 0 $spacing-unit / 3;
+
+  li {
+    float: left;
+    margin-right: $spacing-unit / 6;
+    padding: 0.3em 0.5em 0.2em 0.5em;
   }
-  
-  > :last-child {
-    margin-right: 0;
+}
+
+ul.post-tags {
+  li {
+    border-radius: 0.5em;
+  }
+}
+
+ul.post-categories {
+  li {
+    text-decoration: underline;
   }
 }
 
@@ -383,13 +406,14 @@
 // About font sizes for h1-h6, refer to https://stackoverflow.com/a/6140504/13261366
 .post-title,
 .post-content h1 {
-  @include relative-font-size(2);
+  font-family: $display-font-family;
+  @include relative-font-size(1.8);
   font-weight: bold;
   letter-spacing: -1px;
   line-height: $base-line-height * $base-font-size * 2;
 
   @media screen and (min-width: $on-large) {
-    @include relative-font-size(2.5);
+    @include relative-font-size(2);
   }
 }
 
@@ -402,19 +426,15 @@
   h5, h6 { margin-top: $spacing-unit }
 
   h2 {
-    @include relative-font-size(1.5);
+    @include relative-font-size(1.4);
 
     @media screen and (min-width: $on-large) {
-      @include relative-font-size(1.55);
+      @include relative-font-size(1.5);
     }
   }
 
   h3 {
     @include relative-font-size(1.17);
-
-    @media screen and (min-width: $on-large) {
-      @include relative-font-size(1.175);
-    }
   }
 
   h4 {

data/_sass/hamilton/skin.scss

@@ -121,6 +121,16 @@ table {
   color: $text-color-light;
 }
 
+.post-footer {
+  border-color: $border-color-light;
+}
+
+ul.post-tags {
+  li {
+    background-color: $border-color-light;
+  }
+}
+
 .pagination {
   li {
     a, div {

data/_sass/hamilton/variables.scss

@@ -1,8 +1,9 @@
 // Fonts
-$base-font-family:  "Open Sans", "Noto Serif SC" !default;
-$title-font-family: "Dancing Script" !default;
-$reading-font-family: Roboto, "Noto Sans SC" !default;
-$code-font-family:  Inconsolata !default;
+$base-font-family:  Roboto, "Noto Sans SC", "Noto Sans TC" !default;
+$reading-font-family: "Roboto Slab", "Noto Serif SC", "Noto Serif 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;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-hamilton
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Shangzhi Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll