From e63f48a348f9de18cb3b75254f329fe2d2f66121 Mon Sep 17 00:00:00 2001
From: Skia
Date: Sun, 27 Sep 2020 16:37:35 +0200
Subject: fuji.scss: let the user override both the variables and the CSS rules

---
 README.md                      | 7 +++++--
 assets/scss/_custom.scss       | 2 +-
 assets/scss/_custom_rules.scss | 1 +
 assets/scss/_custom_var.scss   | 2 ++
 assets/scss/fuji.scss          | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 assets/scss/_custom_rules.scss
 create mode 100644 assets/scss/_custom_var.scss

diff --git a/README.md b/README.md
index 979e4e9..8e70f17 100644
--- a/README.md
+++ b/README.md
@@ -218,9 +218,9 @@ Use the `[SITEROOT]/layouts/partials/comment-*.html` to cover `themes/fuji/layou
 
 > Hugo extended version needed.
 
-You can cover theme's internal SCSS variables with your own. Create `[SITEROOT]/assets/scss/_custom.scss` to cover variables in SCSS.
+You can override theme's internal SCSS variables with your own. Create `[SITEROOT]/assets/scss/_custom_var.scss` to cover variables in SCSS.
 
-Varibales available:
+Variables available:
 
 ```scss
 $body-font: -apple-system, BlinkMacSystemFont, 'SF Pro Text', 'Helvetica Neue', 'Helvetica', 'Arial', 'PingFang SC',
@@ -248,6 +248,9 @@ $dark-color-bg: #2f3136; // Discord
 $dark-color-codebg: #414449; // GitHub
 ```
 
+To override SCSS rules, create `[SITEROOT]/assets/scss/_custom_rules.scss`. This file will have priority over anything regarding CSS rules, but is useless for changing variables that are used elsewhere in the theme.
+
+
 ## ✏️ Issue und contributing
 
 Feel free to use the [issue tracker](https://github.com/amzrk2/hugo-theme-fuji/issues). The theme has only been fully tested on Firefox, so if there are some problems when accessing with Chrome or others please also report an issue.
diff --git a/assets/scss/_custom.scss b/assets/scss/_custom.scss
index ca09079..d4b36a6 100644
--- a/assets/scss/_custom.scss
+++ b/assets/scss/_custom.scss
@@ -1 +1 @@
-// wtb covered
+// This file was used for overriding variables. Please use _custom_var.scss instead.
diff --git a/assets/scss/_custom_rules.scss b/assets/scss/_custom_rules.scss
new file mode 100644
index 0000000..7fc3ab1
--- /dev/null
+++ b/assets/scss/_custom_rules.scss
@@ -0,0 +1 @@
+// Override CSS rules with that file
diff --git a/assets/scss/_custom_var.scss b/assets/scss/_custom_var.scss
new file mode 100644
index 0000000..c2765c4
--- /dev/null
+++ b/assets/scss/_custom_var.scss
@@ -0,0 +1,2 @@
+// Override variables with that file
+@import '_custom'; // Keep that for back-compatibility. This shouldn't be used anymore.
diff --git a/assets/scss/fuji.scss b/assets/scss/fuji.scss
index 4d57aee..d88259b 100644
--- a/assets/scss/fuji.scss
+++ b/assets/scss/fuji.scss
@@ -1,5 +1,6 @@
 // var & global
 @import '_var';
+@import '_custom_var';
 @import '_global';
 
 // primer
@@ -28,4 +29,4 @@
 @import '_image';
 
 // let the user override the theme
-@import '_custom';
+@import '_custom_rules';
-- 
cgit v1.2.3


From e126891e7e1e3e7ff0ebb9c26128fa9c5ddbfb5c Mon Sep 17 00:00:00 2001
From: Felix Benning
Date: Thu, 1 Oct 2020 18:21:22 +0200
Subject: German translation

---
 i18n/de.toml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 i18n/de.toml

diff --git a/i18n/de.toml b/i18n/de.toml
new file mode 100644
index 0000000..3c6e3f8
--- /dev/null
+++ b/i18n/de.toml
@@ -0,0 +1,55 @@
+[sidebarToc]
+    other = "Inhalt"
+
+[sidebarPages]
+    other = "Seiten"
+
+[sidebarTags]
+    other = "Tags"
+
+[sidebarLinks]
+    other = "Links"
+
+[sidebarBangumiChart]
+    other = "Bangumi"
+
+[footerPoweredFront]
+    other = "Powered by "
+
+[footerPoweredEnd]
+    other = " "
+
+[postMetaNoTag]
+    other = "Kein Tag"
+
+[postMetaWordCount]
+    one = "{{.Count}} word"
+    other = "{{.Count}} words"
+
+[postMetaReadingTime]
+    one = "{{.Count}} Minute"
+    other = "{{.Count}} Minuten"
+
+[postCopyrightFront]
+    other = "Falls nicht anders angegeben, ist der Inhalt dieser Seite lizensiert unter "
+
+[postCopyrightEnd]
+    other = "."
+
+[postComment]
+    other = "Lade Kommentare"
+
+[archivesTotalPages]
+    other = "Beiträge insgesamt: "
+
+[tagsCurrentTag]
+    other = "Beiträge mit dem Tag {{ .Title }}: "
+
+[searchSuccess]
+    other = "[NUM] Resultate ([TIME] ms)"
+
+[searchNotFound]
+    other = "Keine Übereinstimmung"
+
+[searchFailed]
+    other = "Laden des Index fehlgeschlagen!"
-- 
cgit v1.2.3


From e5ce03ae2bc3e895e55f378633db37933d673047 Mon Sep 17 00:00:00 2001
From: Felix Benning
Date: Thu, 1 Oct 2020 18:26:57 +0200
Subject: missing translation

---
 i18n/de.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/de.toml b/i18n/de.toml
index 3c6e3f8..d251b18 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -23,8 +23,8 @@
     other = "Kein Tag"
 
 [postMetaWordCount]
-    one = "{{.Count}} word"
-    other = "{{.Count}} words"
+    one = "{{.Count}} Wort"
+    other = "{{.Count}} Wörter"
 
 [postMetaReadingTime]
     one = "{{.Count}} Minute"
-- 
cgit v1.2.3