diff --git a/assets/style/main.scss b/assets/style/main.scss index 7dd8901..a6772bb 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -1,9 +1,21 @@ -@import '_variables.scss'; +@charset "utf-8"; -html { - font-family: $main-font-family; -} +$family-sans-serif: "Iosevka Aile", sans-serif; +$family-serif: "Iosevka Etoile", serif; +$family-monospace: "Iosevka", monospace; + +$family-primary: $family-serif; + +@import 'bulma/bulma.sass'; h1, h2, h3, h4, h5, h6 { - font-family: $header-font-family; + font-family: $family-sans-serif; +} + +h1 { + font-size: $size-large; +} + +.site-title { + @extend h1; } diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 55b7c30..c24b3f2 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,26 +1,36 @@ {{ define "main" }} -
-
-

{{ .Title }}

- -
- {{ .Content }} +
+
+
+
+

{{ .Title }}

- {{ with .Params.tags }} -
-
    - {{ range . }} -
  • {{ . }}
    • - {{ end }} -
+
+
+
+ + {{ with .Params.tags }} +
+
    + {{ range . }} +
  • {{ . }}
    • + {{ end }} +
+
+ {{ end }}
- {{ end }} - {{ with .Site.DisqusShortname }} -
- {{ template "_internal/disqus.html" . }} +
+
+ {{ .Content }} +
- {{ end }} -
-
+
+ {{ with .Site.DisqusShortname }} +
+ {{ template "_internal/disqus.html" . }} +
+ {{ end }} +
+
{{ partial "sidebar.html" . }} {{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 9acf434..5f742bb 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,13 +1,21 @@ -
-

{{ .Title }}

- - {{ range .Params.tags }} - {{ . }} - {{ end }} -
- {{ .Summary }} - {{ if .Truncated }} +
+
+
+

{{ .Title }}

+
+
+
+
+ + {{ range .Params.tags }} + {{ . }} + {{ end }} +
+
+ {{ .Summary }} + {{ if .Truncated }} Read more... - {{ end }} + {{ end }} +
diff --git a/layouts/index.html b/layouts/index.html index ab01f67..f5d35b6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,10 +1,23 @@ {{ define "main" }} -
+
+
+
+
+
+ {{ with .Site.Params.Description }}{{.}}{{ end }} +
+
+
+
+
+ +
+
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} {{ range $paginator.Pages }} - {{ .Render "summary" }} + {{ .Render "summary" }} {{ end }} {{ partial "pagination.html" . }} -
-{{ partial "sidebar.html" . }} +
+ {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 384d2bf..3e7ad12 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,12 +1,23 @@ -
- {{ .Site.Title }} - {{ with .Site.Menus.main }} - - {{ end }} -
+
+
+
+ +
+ {{ with .Site.Menus.main }} +
+
+ {{ range . }} + {{ .Name }} + {{ end }} +
+
+ {{ end }} + +
+
+ diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 79f8053..3f95125 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,4 +1,5 @@ -
+
+