merge: pull request #44 from Hyask/master

fuji.scss: let the user override both the variables and the CSS rules

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';