diff --git a/assets/_default/list.scss b/assets/_default/list.scss deleted file mode 100644 index 6e31773..0000000 --- a/assets/_default/list.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '../import/colors.scss'; -@import '../import/main.scss'; -@import '../import/nav.scss'; -@import '../import/footer.scss'; -@import '../import/include.scss'; - -main { - @include posts; -} diff --git a/assets/_default/single.scss b/assets/_default/single.scss deleted file mode 100644 index 191537a..0000000 --- a/assets/_default/single.scss +++ /dev/null @@ -1,108 +0,0 @@ -@import '../import/colors.scss'; -@import '../import/syntax.scss'; -@import '../import/main.scss'; -@import '../import/nav.scss'; -@import '../import/footer.scss'; -@import '../import/include.scss'; - -.section-article { - article { - margin: 0 auto; - max-width: 720px; - .meta { - color: $white-dark; - } - .title { - font-size: 2em; - margin-top: 20px; - } - img { - border-radius: 5px; - box-shadow: 0 0 40px 10px rgb(30, 30, 45); - margin-bottom: 15px; - width: 100%; - } - @include a-underlined; - h2 { - font-size: .6em; - } - aside { - margin-top: 80px; - .tags { - display: flex; - list-style: none; - margin-left: -15px; - padding: 0; - li { - a { - background: $bg60; - border: 0; - border-radius: 5px; - color: $white-dark; - margin-left: 15px; - padding: 10px; - &:hover { - background: $bg50; - color: $white-light; - } - } - } - } - } - } -} - -.section-articles { - display: grid; - grid-template-columns: repeat(2, 1fr); - grid-gap: 1rem; - margin: 20px auto 0 auto; - max-width: 720px; - white-space: nowrap; - &::after { - background: $bg50; - content: ''; - height: 200px; - left: 0; - position: absolute; - width: 100vw; - z-index: -10; - } - article { - display: flex; - flex-flow: column; - height: max-content; - margin: 20px 0; - a { - border-bottom: 1px solid transparent; - color: $white-dark; - transition: border .2s, color .2s; - &:hover { - border-bottom: 1px solid; - color: $red; - text-decoration: none; - } - } - } - .next-article { - margin-right: auto; - } - .previous-article { - margin-left: auto; - } -} - -@media (max-width: 400px) { - .section-articles { - grid-template-columns: repeat(1, 1fr); - &::after { - height: 250px; - } - .next-article { - margin: 20px auto 0 auto; - } - .previous-article { - margin: 0 auto; - } - } -} diff --git a/assets/errorpages.scss b/assets/errorpages.scss deleted file mode 100644 index 7e39bf3..0000000 --- a/assets/errorpages.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import 'import/colors.scss'; -@import 'import/main.scss'; -@import 'import/nav.scss'; -@import 'import/footer.scss'; -@import 'import/include.scss'; - -header { - margin: 150px 0; - text-align: center; - h2 { - font-size: 2em; - } -} diff --git a/assets/import/colors.scss b/assets/import/colors.scss deleted file mode 100644 index 4b615d6..0000000 --- a/assets/import/colors.scss +++ /dev/null @@ -1,17 +0,0 @@ -$green: rgb(100, 200, 130); -$green-dark: rgb(80, 180, 110); -$green-light: rgb(100, 220, 150); -$red: rgb(255, 130, 130); -$red-dark: rgb(235, 110, 110); -$red-light: rgb(255, 150, 150); -$white: rgb(245, 245, 255); -$white-dark: rgb(215, 215, 225); -$white-light: rgb(255, 255, 255); -$white-disabled: rgb(150, 150, 160); - -$bg30: rgb(30, 30, 45); -$bg40: rgb(40, 40, 60); -$bg50: rgb(50, 50, 75); -$bg60: rgb(60, 60, 90); -$bg70: rgb(70, 70, 105); -$bg80: rgb(80, 80, 120); diff --git a/assets/import/footer.scss b/assets/import/footer.scss deleted file mode 100644 index ae2b880..0000000 --- a/assets/import/footer.scss +++ /dev/null @@ -1,60 +0,0 @@ -footer { - background: $bg30; - color: $white-dark; - margin-top: 100px; - overflow-x: auto; - overflow-y: hidden; - white-space: nowrap; - &::after { - background: $bg30; - content: ''; - height: 10000px; - overflow: hidden; - position: fixed; - width: 100vw; - } - .container { - align-items: center; - display: flex; - height: 64px; - .website-subnav { - margin-left: auto; - ul { - display: flex; - list-style-type: none; - padding: 0; - li { - margin-left: 30px; - a { - border-bottom: 1px solid transparent; - color: $white-dark; - padding: 5px 0; - transition: border .2s, color .2s; - &:hover { - border-bottom: 1px solid; - color: $red; - text-decoration: none; - } - } - } - } - } - } -} - -@media (max-width: 600px) { - footer { - .container { - max-width: none; - .website-version { - order: 2; - padding: 10px 20px; - } - .website-subnav { - li { - padding: 4px 30px 4px 0; - } - } - } - } -} diff --git a/assets/import/include.scss b/assets/import/include.scss deleted file mode 100644 index 2b664de..0000000 --- a/assets/import/include.scss +++ /dev/null @@ -1,70 +0,0 @@ -@mixin a-underlined { - a { - border-bottom: 1px solid; - color: $white; - margin: -2px 0; - padding: 2px 0; - transition: border .2s, color .2s; - &:hover { - color: $red; - text-decoration: none; - } - } -} - -@mixin posts { - .section.posts { - .inner { - display: grid; - grid-gap: 1rem; - grid-template-columns: repeat(2, 1fr); - margin: 40px 0; - a { - color: $white-light; - text-decoration: none; - } - article { - background: $bg60; - border-radius: 5px; - color: $white; - display: flex; - flex-flow: column; - height: 100%; - padding: 20px 40px; - transition: background .2s; - &:hover { - background: $bg50; - } - h2 { - color: $white; - display: flex; - font-size: 18px; - font-weight: 400; - margin: 0 0 10px 0; - min-height: 65px; - text-align: center; - span { - margin: auto; - } - } - p.description { - color: $white-dark; - flex: 1; - font-size: 16px; - margin: 20px 0; - } - p.meta { - color: $white-dark; - font-size: 14px; - margin: 0; - text-align: center; - } - } - } - } - @media (max-width: 900px) { - .section.posts .inner { - grid-template-columns: repeat(1, 1fr); - } - } -} diff --git a/assets/import/main.scss b/assets/import/main.scss deleted file mode 100644 index d8b88e4..0000000 --- a/assets/import/main.scss +++ /dev/null @@ -1,59 +0,0 @@ -* { - box-sizing: border-box; - scrollbar-color: $red $bg60; - scrollbar-width: thin; - &::-webkit-scrollbar { - background: $bg60; - width: 6px; - } - &::-webkit-scrollbar-thumb { - background: $red; - } -} -html { - overflow-x: hidden; - overflow-y: scroll; -} -body { - background: $bg40; - color: $white; - display: grid; - font-family: 'Lucida Console', monospace; - line-height: 1.8; - margin: 0; -} -a { - color: $red; - text-decoration: none; - &:hover { - text-decoration: underline; - } -} -h1 { - font-size: 1.5em; -} -h2 { - font-size: 1.3em; -} -h3 { - font-size: 1.1em; -} -h4 { - font-size: .9em; -} -hr { - border-color: $bg60; - color: $bg60; - margin: 60px 0; -} - -.container { - margin: 0 auto; - max-width: 1140px; - width: calc(100% - 40px); -} - -main { - width: 100vw; - margin: 60px 0 0 0; -} diff --git a/assets/import/nav.scss b/assets/import/nav.scss deleted file mode 100644 index c6005c3..0000000 --- a/assets/import/nav.scss +++ /dev/null @@ -1,28 +0,0 @@ -header.main { - align-items: center; - display: flex; - flex-wrap: wrap; - margin: 0 auto; - max-width: 1140px; - min-height: 64px; - width: 100%; - a { - color: $white; - padding: 17.6px 15px; - text-decoration: none; - text-underline-offset: 6px; - margin: 0 15px; - &:hover { - text-decoration: underline; - } - } - h1 { - display: flex; - font-size: 16px; - margin: 0; - } - nav { - display: flex; - flex-wrap: wrap; - } -} diff --git a/assets/import/syntax.scss b/assets/import/syntax.scss deleted file mode 100644 index b955b89..0000000 --- a/assets/import/syntax.scss +++ /dev/null @@ -1,7 +0,0 @@ - .chroma { // background - background: $bg30; - border-radius: 5px; - color: $white; - padding: 10px; - } - diff --git a/assets/index.scss b/assets/index.scss deleted file mode 100644 index 8a54fdc..0000000 --- a/assets/index.scss +++ /dev/null @@ -1,134 +0,0 @@ -@import 'import/colors.scss'; -@import 'import/main.scss'; -@import 'import/nav.scss'; -@import 'import/footer.scss'; -@import 'import/include.scss'; - -.section.header { - background: $bg60; - @include a-underlined; - header { - margin: 60px auto; - max-width: 600px; - text-align: center; - h2 { - font-size: 2.5em; - margin: auto; - } - } - .section.contact { - background: $bg70; - border-radius: 5px; - display: flex; - padding: 20px; - margin: 60px auto; - max-width: 500px; - .table.contact { - margin: 0 auto; - white-space: nowrap; - tr { - td { - &:first-of-type { - padding: 5px 30px 5px 0; - text-align: right; - } - } - } - } - } -} - -main { - .latest { - color: $white-dark; - display: block; - font-size: 1.5em; - text-align: center; - margin: -7px; - a { - color: $white; - font-weight: bold; - transition: border .2s, color .2s; - &:hover { - color: $red; - text-decoration: none; - } - } - } - .section.projects { - .inner { - display: grid; - grid-gap: 1rem; - grid-template-columns: repeat(4, 1fr); - margin: 40px 0; - a { - color: $white-light; - text-decoration: none; - } - article { - background: $bg60; - border-radius: 5px; - color: $white; - display: flex; - flex-flow: column; - height: 100%; - padding: 20px 40px; - transition: background .2s; - &:hover { - background: $bg50; - } - h2 { - color: $white; - font-size: 18px; - font-weight: 400; - margin: 0; - text-align: center; - } - p.meta { - color: $white-dark; - font-size: 14px; - margin: 0; - text-align: center; - } - } - } - } - @include posts; -} - - -@media (max-width: 900px) { - main { - .section.projects.inner { - grid-template-columns: repeat(2, 1fr); - } - } -} -@media (max-width: 600px) { - .section.header { - .section.contact { - border-radius: 0; - padding: 10px; - margin: 60px -20px; - max-width: none; - overflow-x: auto; - width: 100vw; - .table.contact { - margin: 0 auto; - white-space: nowrap; - tr { - td { - &:first-of-type { - padding: 5px 20px 5px 0; - } - } - } - } - } - } - main { - .section.projects.inner { - grid-template-columns: repeat(1, 1fr); - } - } -} diff --git a/assets/style.scss b/assets/style.scss new file mode 100644 index 0000000..c4089da --- /dev/null +++ b/assets/style.scss @@ -0,0 +1,112 @@ +:root { + --background: rgb(10, 10, 10); + --border: rgb(40, 40, 40); + --text: rgb(255, 255, 255); + --vrifox-red: rgb(255, 130, 130); +} +@media (prefers-color-scheme: light) { + :root { + --background: rgb(255, 255, 255); + --border: rgb(215, 215, 215); + --text: rgb(0, 0, 0); + } +} + +* { + box-sizing: border-box; + scrollbar-color: var(--vrifox-red) var(--background); + scrollbar-width: thin; + &::-webkit-scrollbar { + background: var(--background); + width: 6px; + } + &::-webkit-scrollbar-thumb { background: var(--vrifox-red); } +} + +html { + overflow-x: hidden; + overflow-y: scroll; +} +body { + background: var(--background); + color: var(--text); + display: grid; + font-family: system-ui, sans-serif; + font-size: 1.2em; + line-height: 1.8; + margin: 0; +} + +a { + color: var(--text); + text-decoration: underline; + text-underline-offset: 6px; + text-decoration-color: var(--vrifox-red); + &:hover { text-decoration: underline; } +} + +h1 { font-size: 1.5em; } +h2 { font-size: 1.3em; } +h3 { font-size: 1.1em; } +h4 { font-size: 0.9em; } + +hr { + border-color: var(--text); + color: var(--text); + margin: 60px 0; +} + +// ------------------------ +// - header / nav; footer - +// ------------------------ +header, footer { + align-items: center; + display: flex; + flex-wrap: wrap; + margin: 0 auto; + max-width: 1140px; + min-height: 64px; + width: 100%; + a { + color: var(--text); + padding: 17.6px 15px; + text-decoration-color: var(--background); + text-decoration-thickness: 2px !important; + transition: text-decoration-color .2s; + margin: 0 15px; + &:hover { text-decoration-color: var(--vrifox-red); } + &.active { text-decoration-color: var(--text); } + } +} +header { + border-bottom: 1px solid var(--border); + h1 { + display: flex; + font-size: 1em; + margin: 0; + } + nav { + display: flex; + flex-wrap: wrap; + } +} +footer { + border-top: 1px solid var(--border); + color: var(--text); + a { color: var(--text); } + span { + padding: 17.6px 30px; + margin-right: auto; + } +} + +// -------- +// - main - +// -------- +main { + margin: 60px auto; + max-width: 720px; + padding: 30px; + width: 100%; + span { font-size: .8em; } +} diff --git a/config.yaml b/config.yaml index afb8d20..3c775eb 100644 --- a/config.yaml +++ b/config.yaml @@ -12,16 +12,26 @@ menu: url: / weight: 1 main: + - identifier: about + name: About + title: about + url: /about/ + weight: 1 - identifier: blog - name: blog + name: Blog title: blog url: /blog/ - weight: 1 + weight: 2 + - identifier: blogroll + name: Blogroll + title: blogroll + url: /blogroll/ + weight: 3 - identifier: projects - name: projects + name: Projects title: projects url: /projects/ - weight: 2 + weight: 4 externallinks: - identifier: git name: git diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index f1410c7..3bd2168 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,13 +2,14 @@ {{ with .Title }} {{ . }} – {{ end }}{{ .Site.Title }} + {{- $style := resources.Get "/style.scss" | resources.ToCSS (dict "outputStyle" "compressed") }} + - {{ block "stylesheet" . }}{{ end }} {{ partial "nav.html" . }} - {{ block "main" . }}{{ end }} + {{- block "main" . }}{{ end }} {{ partial "footer.html" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b688552..96d1453 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,32 +4,12 @@ {{- end -}} - {{- define "main" }} +{{- define "main" }} +
-
-
- -
-
+ {{- range .Pages }} +

{{ .Title }} {{ .Date.Format "2 January 2006" }}

+ {{- end }}
- {{- end }} + +{{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 118152e..a513dab 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,69 +1,26 @@ -{{- define "stylesheet" -}} - {{- $scss := resources.Get "/_default/single.scss" -}} - {{- $style := $scss | resources.ToCSS -}} - -{{- end -}} - - {{- define "main" -}} +{{- define "main" }}
-
-
-
-

- {{ if eq .Params.type "post" }}{{ .Date.Format "2. January 2006" }}{{ end }} - {{- if eq .Params.type "singlepage" }}version: {{ .Date.Format "2006-01-02" }}{{ end }} - {{- with .Params.author }}by {{ . }}{{ end }} -

-

{{ .Title }}

- {{ with .Params.featured_image }}{{ end }} - - {{ printf "" | safeHTML }} - {{ .Content }} - {{- printf "" | safeHTML }} - - -
-
- {{- if ne .Params.type "singlepage" }} -
- - -
+

{{ .Title }}

+ {{- if eq .Params.type "post" }} +

{{ .Date.Format "2. January 2006" }}

+ {{- end }} + {{ .Content -}} +
+ {{- end }} +
- {{- end }} +{{- end }} diff --git a/layouts/errorpages/list.html b/layouts/errorpages/list.html index 696de8d..dd6cd21 100644 --- a/layouts/errorpages/list.html +++ b/layouts/errorpages/list.html @@ -1,18 +1,6 @@ -{{ define "stylesheet" }}{{ $sass := resources.Get "/errorpages.scss" }}{{ $style := $sass | resources.ToCSS }} - -{{ end }} - -{{ define "main" }} -
-
-
-
-

{{ .Params.heading }}

- {{.Params.subheading}} -
- {{.Content}} -
-
-
-{{ end }} - +{{- define "main" }} +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/errorpages/single.html b/layouts/errorpages/single.html index 9ec7578..dd6cd21 100644 --- a/layouts/errorpages/single.html +++ b/layouts/errorpages/single.html @@ -1,17 +1,6 @@ -{{ define "stylesheet" }}{{ $sass := resources.Get "/errorpages.scss" }}{{ $style := $sass | resources.ToCSS }} - -{{ end }} - -{{ define "main" }} -
-
-
-
-

{{ .Params.heading }}

- {{.Params.subheading}} -
- {{.Content}} -
-
-
-{{ end }} +{{- define "main" }} +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/index.html b/layouts/index.html index 692137d..3713c36 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,73 +1,7 @@ -{{- define "stylesheet" -}} - {{- $scss := resources.Get "/index.scss" -}} - {{- $style := $scss | resources.ToCSS -}} - -{{- end -}} - - {{- define "main" -}} -
-
-
-

{{ .Params.heading }}

- {{.Params.subheading}} -
-
- - {{- range sort .Params.contact "weight" "asc" }} - - - - - {{- end }} -
{{ .name }} - {{- with .url }}{{ end -}} - {{ .handle }} - {{- with .url }}{{ end }} {{ with .hint }}{{ .name }}{{ end -}} -
-
-
-
- +{{- define "main" }}
-
-
- - latest projects - -
- {{- range first 4 (where .Site.RegularPages "Type" "project") }} - -
-

{{ .Title }}

-

- {{ with .Params.activetime }}{{ . }}
{{ end }} - {{ with .Params.status }}{{ . }}{{ end }} -

-
-
- {{- end }} -
-
-
-
- - latest posts - - -
-
-
+ {{- range first 8 (where .Site.RegularPages "Type" "post") }} +

{{ .Title }} {{ .Date.Format "2 January 2006" }}

{{- end }} + +{{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 702b027..fa3698c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,21 +1,7 @@ - -