summaryrefslogtreecommitdiffstats
path: root/assets/scss
diff options
context:
space:
mode:
authoramzrk22020-10-02 10:09:20 +0800
committeramzrk22020-10-02 10:09:20 +0800
commit00a0fbe2601fa6a75c10d7a53c87e605775dd177 (patch)
tree63a19e62d01d63822267a74e1016d6a6b270712d /assets/scss
parentd8203862d3c4534c21da241b7cd7ff9746fcc6d9 (diff)
parent21a1d221d9d0594f9b800284cf363ecddf09dccb (diff)
downloadhugo-theme-fuji-00a0fbe2601fa6a75c10d7a53c87e605775dd177.tar.gz
hugo-theme-fuji-00a0fbe2601fa6a75c10d7a53c87e605775dd177.tar.bz2
hugo-theme-fuji-00a0fbe2601fa6a75c10d7a53c87e605775dd177.zip
Merge branch 'master' of github.com:amzrk2/hugo-theme-fuji
Diffstat (limited to 'assets/scss')
-rw-r--r--assets/scss/_custom.scss2
-rw-r--r--assets/scss/_custom_rules.scss1
-rw-r--r--assets/scss/_custom_var.scss2
-rw-r--r--assets/scss/fuji.scss3
4 files changed, 6 insertions, 2 deletions
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';