feat(style): change custom style file path (#360)

dillonzq · May 15, 2020 · da9df3b · da9df3b
1 parent c673353
commit da9df3b
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 28 deletions.
diff --git a/exampleSite/config/css/_custom.scss → assets/css/_custom.scss b/exampleSite/config/css/_custom.scss → assets/css/_custom.scss
diff --git a/assets/css/_override.scss b/assets/css/_override.scss
@@ -0,0 +1,4 @@
+// ==============================
+// Override Variables
+// 覆盖变量
+// ==============================
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
@@ -2,6 +2,8 @@
 // Variables
 // ==============================
 
+@import url('https://fonts.googleapis.com/css2?family=Nunito:wght@800&display=swap');
+
 // ========== Global ========== //
 // Font and Line Height
 $global-font-family: system-ui, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif !default;
@@ -57,7 +59,7 @@ $header-background-color: #f8f8f8 !default;
 $header-background-color-dark: #252627 !default;
 
 // Font style of the header title
-$header-title-font-family: $global-font-family !default;
+$header-title-font-family: Nunito, $global-font-family !default;
 $header-title-font-size: 1.5rem !default;
 
 // Color of the hover header item

diff --git a/assets/css/style.template.scss → assets/css/style.scss b/assets/css/style.template.scss → assets/css/style.scss
@@ -1,10 +1,7 @@
 @charset "utf-8";
 
 @import "_variables";
-
-{{- if fileExists "config/css/_override.scss" -}}
-  @import "_override";
-{{- end -}}
+@import "_override";
 
 @import "_mixin/index";
 
@@ -19,6 +16,4 @@
 
 @import "_core/media";
 
-{{- if fileExists "config/css/_custom.scss" -}}
-  @import "_custom";
-{{- end -}}
+@import "_custom";
diff --git a/exampleSite/assets/css/_custom.scss b/exampleSite/assets/css/_custom.scss
@@ -0,0 +1,4 @@
+// ==============================
+// Custom style
+// 自定义样式
+// ==============================
diff --git a/exampleSite/assets/css/_override.scss b/exampleSite/assets/css/_override.scss
@@ -0,0 +1,4 @@
+// ==============================
+// Override Variables
+// 覆盖变量
+// ==============================
diff --git a/exampleSite/config/css/_override.scss b/exampleSite/config/css/_override.scss
diff --git a/exampleSite/content/posts/theme-documentation-basics/index.en.md b/exampleSite/content/posts/theme-documentation-basics/index.en.md
@@ -799,15 +799,17 @@ Add a logo image (127x40) and a cover image (800x600) in the `static` directory.
 
 ### 3.4 Style Customization
 
+{{< version 0.2.8 changed >}}
+
 {{< admonition >}}
 Hugo **extended** version is necessary for the style customization.
 {{< /admonition >}}
 
 **LoveIt** theme has been built to be as configurable as possible by defining custom `.scss` style files.
 
-The directory including the custom `.scss` style files is `config/css` relative to **your project root directory**.
+The directory including the custom `.scss` style files is `assets/css` relative to **your project root directory**.
 
-In `config/css/_override.scss`, you can override the variables in `themes/LoveIt/assets/css/_variables.scss` to customize the style.
+In `assets/css/_override.scss`, you can override the variables in `themes/LoveIt/assets/css/_variables.scss` to customize the style.
 
 Here is a example:
 
@@ -816,7 +818,7 @@ Here is a example:
 $code-font-family: Fira Mono, Source Code Pro, Menlo, Consolas, Monaco, monospace;
 ```
 
-In `config/css/_custom.scss`, you can add some css style code to customize the style.
+In `assets/css/_custom.scss`, you can add some css style code to customize the style.
 
 ## 4 Multilingual and i18n
 

diff --git a/exampleSite/content/posts/theme-documentation-basics/index.fr.md b/exampleSite/content/posts/theme-documentation-basics/index.fr.md
@@ -804,15 +804,17 @@ Add a logo image (127x40) and a cover image (800x600) in the `static` directory.
 
 ### 3.4 Style Customization
 
+{{< version 0.2.8 changed >}}
+
 {{< admonition >}}
 Hugo **extended** version is necessary for the style customization.
 {{< /admonition >}}
 
 **LoveIt** theme has been built to be as configurable as possible by defining custom `.scss` style files.
 
-The directory including the custom `.scss` style files is `config/css` relative to **your project root directory**.
+The directory including the custom `.scss` style files is `assets/css` relative to **your project root directory**.
 
-In `config/css/_override.scss`, you can override the variables in `themes/LoveIt/assets/css/_variables.scss` to customize the style.
+In `assets/css/_override.scss`, you can override the variables in `themes/LoveIt/assets/css/_variables.scss` to customize the style.
 
 Here is a example:
 
@@ -821,7 +823,7 @@ Here is a example:
 $code-font-family: Fira Mono, Source Code Pro, Menlo, Consolas, Monaco, monospace;
 ```
 
-In `config/css/_custom.scss`, you can add some css style code to customize the style.
+In `assets/css/_custom.scss`, you can add some css style code to customize the style.
 
 ## 4 Multilingual and i18n
 

diff --git a/exampleSite/content/posts/theme-documentation-basics/index.zh-cn.md b/exampleSite/content/posts/theme-documentation-basics/index.zh-cn.md
@@ -803,15 +803,17 @@ hugo
 
 ### 3.4 自定义样式
 
+{{< version 0.2.8 changed >}}
+
 {{< admonition >}}
 Hugo **extended** 版本对于自定义样式是必需的.
 {{< /admonition >}}
 
 通过定义自定义 `.scss` 样式文件, **LoveIt** 主题支持可配置的样式.
 
-包含自定义 `.scss` 样式文件的目录相对于 **你的项目根目录** 的路径为 `config/css`.
+包含自定义 `.scss` 样式文件的目录相对于 **你的项目根目录** 的路径为 `assets/css`.
 
-在 `config/css/_override.scss` 中, 你可以覆盖 `themes/LoveIt/assets/css/_variables.scss` 中的变量以自定义样式.
+在 `assets/css/_override.scss` 中, 你可以覆盖 `themes/LoveIt/assets/css/_variables.scss` 中的变量以自定义样式.
 
 这是一个例子:
 
@@ -820,7 +822,7 @@ Hugo **extended** 版本对于自定义样式是必需的.
 $code-font-family: Fira Mono, Source Code Pro, Menlo, Consolas, Monaco, monospace;
 ```
 
-在 `config/css/_custom.scss` 中, 你可以添加一些 CSS 样式代码以自定义样式.
+在 `assets/css/_custom.scss` 中, 你可以添加一些 CSS 样式代码以自定义样式.
 
 ## 4 多语言和 i18n
 

diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html
@@ -35,9 +35,9 @@
 {{- partial "plugin/style.html" $style -}}
 
 {{- /* style.min.css */ -}}
-{{- $style := dict "source" "css/style.template.scss" "fingerprint" $fingerprint -}}
-{{- $options := dict "targetPath" "css/style.min.css" "includePaths" (slice "config/css") "enableSourceMap" true -}}
-{{- $style = dict "template" "style.scss" "context" . "toCSS" $options | merge $style -}}
+{{- $style := dict "source" "css/style.scss" "fingerprint" $fingerprint -}}
+{{- $options := dict "targetPath" "css/style.min.css" "enableSourceMap" true -}}
+{{- $style = dict "context" . "toCSS" $options | merge $style -}}
 {{- partial "plugin/style.html" $style -}}
 
 {{- /* Font Awesome */ -}}

diff --git a/..._b8ba9a60a151126bfcde1421dc0b972d.content → ..._d75fd08668b4bae707167bbce4d8ca46.content b/..._b8ba9a60a151126bfcde1421dc0b972d.content → ..._d75fd08668b4bae707167bbce4d8ca46.content
diff --git a/...css_b8ba9a60a151126bfcde1421dc0b972d.json → ...css_d75fd08668b4bae707167bbce4d8ca46.json b/...css_b8ba9a60a151126bfcde1421dc0b972d.json → ...css_d75fd08668b4bae707167bbce4d8ca46.json