CUSTOM to MAIN (DON'T MERGE! JUST FOR INSPECTION !)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ZERAN WU
+Copyright (c) 2022 ZERAN WU, ROBBI NESPU
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -9,11 +9,13 @@ Some works are still in progress. See [TODOS](#todos) below.
 ## Install
 
 1. clone cactus to your hugo site's `themes` folder.
+
 ```
 git clone https://github.com/monkeyWzr/hugo-theme-cactus.git themes/cactus
 ```
 
 2. change your theme to cactus in your site config
+
 ```toml
 # config.toml
 
@@ -22,6 +24,7 @@ theme = "cactus"
 
 3. config your site. See [Config] or a [complete config sample](exampleSite/config.toml)
 4. test your site
+
 ```
 hugo server
 ```
@@ -75,57 +78,60 @@ weight = 4
 
 ### Homepage settings
 
-* description: description will be displayed in the homepage. Markdown syntax is supported in the description string.
+- description: description will be displayed in the homepage. Markdown syntax is supported in the description string.
+
 ```toml
 [params]
 
   description = "Hugo is a general-purpose website framework. Technically speaking, Hugo is a static site generator. Unlike systems that dynamically build a page with each visitor request, Hugo builds pages when you create or update your content. Since websites are viewed far more often than they are edited, Hugo is designed to provide an optimal viewing experience for your website’s end users and an ideal writing experience for website authors."
 ```
 
-* set your main section (used as the link for the "writings" title on the homepage)
+- set your main section (used as the link for the "writings" title on the homepage)
 
 ```toml
 [params]
   mainSection = "posts"
 ```
 
-* change the default main section title from Writings, to something else:
+- change the default main section title from Writings, to something else:
 
 ```toml
 [params]
   mainSectionTitle = "Blog"
 ```
 
-* Show only the 5 most recent posts (default)
+- Show only the 5 most recent posts (default)
 
 ```toml
 [params]
   showAllPostsOnHomePage = false
   postsOnHomePage = 5
 ```
-* show all posts
+
+- show all posts
 
 ```toml
 [params]
   showAllPostsOnHomePage = true
   postsOnHomePage = 5 # this option will be ignored
 ```
 
-* show tagsoverview (default) or not
-* 
+- show tagsoverview (default) or not
+-
+
 ```toml
 [params]
   tagsOverview = true
 ```
 
-* display the table of contents inline on blog posts, rather than as part of the navigation menu:
+- display the table of contents inline on blog posts, rather than as part of the navigation menu:
 
 ```toml
 [params]
   tocInline = true
 ```
 
-* show projects list (default) or not.
+- show projects list (default) or not.
 
 ```toml
 [params]
@@ -141,20 +147,21 @@ Create your projects data file `data/projects.yaml|toml|json`. Hugo support yaml
 for former hexo cactus users: please assign your json array to a `list` key.
 
 for example, `data/projects.json`:
+
 ```json
 {
-   "list": [
-      {
-         "name":"Hexo",
-         "url":"https://hexo.io/",
-         "desc":"A fast, simple & powerful blog framework"
-      },
-      {
-         "name":"Font Awesome",
-         "url":"http://fontawesome.io/",
-         "desc":"The iconic font and CSS toolkit"
-      }
-   ]
+  "list": [
+    {
+      "name": "Hexo",
+      "url": "https://hexo.io/",
+      "desc": "A fast, simple & powerful blog framework"
+    },
+    {
+      "name": "Font Awesome",
+      "url": "http://fontawesome.io/",
+      "desc": "The iconic font and CSS toolkit"
+    }
+  ]
 }
 ```
 
@@ -178,17 +185,20 @@ The `name` key expects the name of a [Font Awesome icon](https://fontawesome.com
 
 ### Copyright
 
-Assign your copy right to `.Site.Copyright`. Cactus will append current year to the head.
-
-TODO: Customizable copyright year
+Assign your copy right to `.Site.Params.Copyright.Name`.
 
 ```toml
-copyright = "Zeran Wu" # cactus theme will use site title if copyright is not set
+[params.copyright]
+  enabled = true # default
+  name = "Zeran Wu" # cactus will use title if copyright is not set
+  startYear = 2020 # if not provided, will use current year.
+  endYear = 2021 # if not provided, will use current year.
 ```
 
 ### Comments
 
 Comments is disabled by default. Enable comments in your `.Site.Params`.
+
 ```toml
 [params]
   [params.comments]
@@ -197,6 +207,7 @@ Comments is disabled by default. Enable comments in your `.Site.Params`.
 ```
 
 You can also enable/disable comments per post. in your posts' front matter, add:
+
 ```yaml
 comments: true
 ```
@@ -236,11 +247,13 @@ default config:
 Cactus uses hugo's bulit in analytics templates. Check [hugo's documents](https://gohugo.io/templates/internal#google-analytics) for details.
 
 Set you tracking id in your site config.
+
 ```toml
 googleAnalytics = "UA-XXXXXXXX-XX" # or G-XXXXXXXX if you are using Google Analytics v4 (gtag.js)
 ```
 
 If you are using Google Analytics v3 (analytics.js), you can switch to asynchronous tracking by set `params.googleAnalyticsAsync` to `true`.
+
 ```toml
 [params]
 googleAnalyticsAsync = true # not required
@@ -262,19 +275,22 @@ Please also check [Configure RSS](https://gohugo.io/templates/rss/#configure-rss
 ### Mathjax
 
 Cactus supports mathjax. Just add `mathjax` option in your site config:
+
 ```toml
 [params]
   mathjax = true  # not required
 ```
 
 You can also enable/disable mathjax per post. In your posts' front matter, add:
+
 ```yaml
 mathjax: true # or false
 ```
 
 The site config will be ignored when `mathjax` option exists in front matter.
 
-### Archive 
+### Archive
+
 Pagination on posts archive can be disabled to show all posts in chronological order
 
 ```toml
@@ -290,9 +306,9 @@ Pagination on posts archive can be disabled to show all posts in chronological o
 - [x] Analytics
 - [ ] Local Search
 - [ ] toc template
-- [ ] Customizable copyright year
+- [x] Customizable copyright year
 - [ ] gallery
-- [ ] expose [mathjax configuration](https://docs.mathjax.org/en/latest/web/configuration.html#web-configuration) 
+- [ ] expose [mathjax configuration](https://docs.mathjax.org/en/latest/web/configuration.html#web-configuration)
 
 ## License
 

exampleSite/archetypes/default.md → archetypes/default.md

@@ -3,4 +3,3 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 ---
-

assets/scss/_extend.scss

@@ -104,7 +104,8 @@ table {
   text-align: left;
   font-size: $font-size - 2px;
   overflow: auto;
-  display: block;
+  //display: block;
+  display: table;
 }
 th {
   padding: 8px;
@@ -116,4 +117,4 @@ th {
 td {
   padding: 0 8px;
   border-bottom: none;
-}
+}

assets/scss/_variables.scss

@@ -2,12 +2,12 @@
 $font-family-body: "JetBrains Mono", monospace;
 $font-family-mono: "JetBrains Mono", monospace;
 $font-family-tt: "Inconsolata", monospace;
-$font-size: 14px;
-$line-height: 1.725;
+$font-size: 16px;
+$line-height: 1.45;
 $page-width: 48rem;
 // Logo
 $logo-width: 50px;
 $logo-height: 50px;
 $logo-grayout: true;
 // Colors
-$colors: "dark" // white dark light classic
+$colors: "dark"; // white dark light classic

assets/scss/colors/classic.scss

@@ -10,4 +10,6 @@ $color-text: #22272a;
 $color-accent-1: #cc2a41;
 $color-accent-2: rgba(86, 124, 119, .8);
 $color-accent-3: #666;
-$color-quote: #cc2a41;
+$color-quote: #cc2a41;
+$color-border-code: #282a36;
+$color-text-code: white;

assets/scss/colors/dark.scss

@@ -10,4 +10,6 @@ $color-text: #c9cacc;
 $color-accent-3: #cccccc;
 $color-accent-2: #eeeeee;
 $color-accent-1: #2bbc8a;
-$color-quote: #ccffb6;
+$color-quote: #ccffb6;
+$color-border-code: #282a36;
+$color-text-code: white;

assets/scss/colors/light.scss

@@ -11,4 +11,6 @@ $color-text: #363533;
 $color-accent-3: #666666;
 $color-accent-2: #111111;
 $color-accent-1: #d44375;
-$color-quote: #ab2251;
+$color-quote: #ab2251;
+$color-border-code: #282a36;
+$color-text-code: white;

assets/scss/colors/white.scss

@@ -11,4 +11,6 @@ $color-text: #383838;
 $color-accent-3: #8c8c8c;
 $color-accent-2: #383838;
 $color-accent-1: #2bbc8a;
-$color-quote: #2bbc8a;
+$color-quote: #2bbc8a;
+$color-border-code: #282a36;
+$color-text-code: white;