Merge dev into main branch #2

Merged
vrifox merged 11 commits from dev into main 2023-01-06 22:53:36 +01:00
8 changed files with 155 additions and 161 deletions
Showing only changes of commit 59e98e5274 - Show all commits

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
# generated directories # generated directories
/public/* /public/*
/resources/_gen/* /resources/_gen/*
.vscode/
# ignored files # ignored files
.directory .directory

View file

@ -1,98 +1,90 @@
:root { // general
--background: hsl(210, 21%, 15%); @import "variables";
--border: hsl(210, 21%, 20%);
--text: hsl(210, 21%, 95%); // site parts
--text-2: hsl(210, 21%, 80%); @import "sidebar";
--text-secondary: hsl(210, 21%, 40%); @import "footer";
--vriish-red: hsl(0, 100%, 75%);
--rose: hsl(0, 100%, 75%); // pages
--orange: hsl(25, 100%, 75%); @import "home";
--gold: hsl(50, 100%, 75%);
--emerald: hsl(130, 100%, 75%);
--sky: hsl(215, 100%, 75%);
--purpur: hsl(275, 100%, 75%);
--white: hsl(360, 100%, 100%);
}
@media (prefers-color-scheme: light) {
:root {
--background: rgb(255, 245, 235);
--border: rgb(225, 215, 205);
--text: rgb(50, 40, 30);
--text-2: rgb(90, 80, 70);
}
}
* { * {
box-sizing: border-box; box-sizing: border-box;
scrollbar-color: var(--vriish-red) var(--background); scrollbar-color: var(--vriish-rose) var(--background);
scrollbar-width: thin; scrollbar-width: thin;
&::-webkit-scrollbar { &::-webkit-scrollbar {
background: var(--background); background: var(--background);
width: 6px; width: 6px;
} }
&::-webkit-scrollbar-thumb { background: var(--vriish-red); } &::-webkit-scrollbar-thumb { background: var(--vriish-rose); }
} }
html { html {
margin: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
} padding: 0;
body { body {
background: var(--background); background: var(--background);
color: var(--text); color: var(--text);
display: grid; display: grid;
font-family: system-ui, sans-serif; font-family: system-ui, sans-serif;
font-size: 1.2em; font-size: 1.2em;
line-height: 1.7; grid-template-areas:
margin: 0; "header header"
} "sidebar content"
"sidebar footer";
h1, h2, h3, h4, h5, h6 { line-height: 1.7;
line-height: 1em; margin: 0;
margin: .8em 0; @media (max-width: 920px) {
} grid-template-areas:
"content"
a { "sidebar"
color: var(--text); "footer";
text-decoration: underline; }
text-decoration-color: var(--vriish-red); h1, h2, h3, h4, h5, h6 {
text-underline-offset: 3px; line-height: 1em;
transition: text-decoration-color .2s; margin: .8em 0;
&:hover { text-decoration-color: var(--text); } }
} a {
color: var(--text);
center { text-decoration: underline;
margin: 19.2px 0; text-decoration-color: var(--vriish-rose);
text-align: center; text-underline-offset: 3px;
} transition: text-decoration-color .2s;
&:hover { text-decoration-color: var(--text); }
pre { }
border: 1px solid var(--vriish-red); pre {
border-radius: 4px; border: 1px solid var(--vriish-rose);
overflow: auto; border-radius: 4px;
padding: 10px 15px; overflow: auto;
} padding: 10px 15px;
}
p { p {
hyphens: auto; hyphens: auto;
img { img {
border: 2px solid var(--border); border: 2px solid var(--border);
border-radius: 4px; border-radius: 4px;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
}
}
hr {
border: 1px solid var(--border);
color: var(--border);
margin: 60px 0;
}
} }
} }
hr { .global-header {
border: 1px solid var(--border); grid-area: header;
color: var(--border);
margin: 60px 0;
} }
// ------------------------ // ------------------------
// - header / nav; footer - // - header / nav; footer -
// ------------------------ // ------------------------
header, footer { /*header, footer {
align-items: center; align-items: center;
display: flex; display: flex;
overflow: auto; overflow: auto;
@ -104,7 +96,7 @@ header, footer {
text-decoration-thickness: 2px !important; text-decoration-thickness: 2px !important;
text-underline-offset: 6px; text-underline-offset: 6px;
margin: 0 15px; margin: 0 15px;
&:hover { text-decoration-color: var(--vriish-red); } &:hover { text-decoration-color: var(--vriish-rose); }
} }
} }
header { header {
@ -116,7 +108,7 @@ header {
font-size: 1em; font-size: 1em;
margin: 0; margin: 0;
a { a {
color: var(--vriish-red); color: var(--vriish-rose);
} }
} }
nav { nav {
@ -126,24 +118,16 @@ header {
aside { aside {
margin-left: auto; margin-left: auto;
} }
} }*/
footer {
bottom: 0;
color: var(--text-secondary);
position: absolute;
a { color: var(--text-secondary); }
span {
padding: 17.6px 30px;
margin-right: auto;
}
}
// -------- // --------
// - main - // - main -
// -------- // --------
main { main {
grid-area: content;
margin: 20px auto; margin: 20px auto;
max-width: 720px; max-width: 1000px;
overflow: hidden; overflow: hidden;
padding: 30px; padding: 30px;
width: 100%; width: 100%;
@ -151,7 +135,7 @@ main {
} }
#intro-heading { #intro-heading {
background-image: linear-gradient(180deg, var(--rose) 0%, var(--rose) 50%, var(--gold) 95%, var(--rose) 100%); background-image: linear-gradient(180deg, var(--vriish-rose) 0%, var(--vriish-rose) 50%, var(--gold) 95%, var(--vriish-rose) 100%);
background-clip: text; background-clip: text;
-webkit-background-clip: text; -webkit-background-clip: text;
color: transparent; color: transparent;

View file

@ -1,42 +0,0 @@
baseURL = "https://vrifox.cc/"
title = "Vris Cute Corner"
enableRobotsTXT = true
[menu]
[[menu.name]]
identifier = "vrifox.cc"
name = "VrifoxCC"
url = "/"
weight = 1
[[menu.main]]
identifier = "kenntnisse"
name = "Kenntnisse"
url = "/kenntnisse/"
weight = 1
[[menu.main]]
identifier = "Portfolio"
name = "Portfolio"
url = "/portfolio/"
weight = 2
[[menu.footer]]
identifier = "blog"
name = "Blog"
url = "/blog/"
weight = 1
[[menu.footer]]
identifier = "blogroll"
name = "Empfehlungen"
url = "/blogroll/"
weight = 2
[markup]
[highlight]
anchorLineNos = false
lineNos = false
lineNumbersInTable = false
noClasses = false
style = "dracula"
tabWidth = 4
[goldmark]
[extensions]
linkify = false
[renderer]
unsafe = true

View file

@ -1,14 +1,3 @@
--- ---
title: "Über Vri" title: "Hola 🖖"
--- ---
# Vris Atelier {#intro-heading}
**Grafik.**
Vektorgrafiken setzen und Rastergrafiken pixeln.
**Gestaltung.**
Webseiten entwerfen, umsetzen und optimieren.
**Infrastruktur.**
Server und Dienste aufsetzen, absichern und betreiben.

View file

@ -9,6 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head> </head>
<body> <body>
{{- block "header" . }}{{ end }}
{{ partial "nav.html" . }} {{ partial "nav.html" . }}
{{- block "main" . }}{{ end }} {{- block "main" . }}{{ end }}
{{ partial "footer.html" . }} {{ partial "footer.html" . }}

View file

@ -1,5 +1,56 @@
{{- define "header" }}
<header id="introduction" class="global-header">
<h1>Hola 🖖</h1>
<p>Ich bin Vri 🙂</p>
</header>
{{ end }}
{{- define "main" }} {{- define "main" }}
<main> <main>
{{ .Content -}} <h2>Aus meinem Blog</h2>
<section id="latest-posts">
{{ range first 3 (where .Site.RegularPages "Section" "blog") }}
<a href="{{ .Permalink }}" class="post-group">
<p class="title">{{ .Title }}</p>
<aside class="meta" title="{{ .Date.Format "2 Jan 2006, 15:04 MST" }}">
<span class="date">{{ .Date.Format "2. January 2006" }}</span>
<span class="author">{{ with .Params.author }}by {{ end }}{{ .Params.author }}</span>
</aside>
</a>
{{ end }}
</section>
<section id="interests">
<h2>Interessen</h1>
<div>Programmieren</div>
<div>Gestalten</div>
<div>Übersetzen</div>
</section>
<section id="languages">
<div></div>
</section>
<section id="skills">
<h2>Kenntnisse</h1>
<div>HTML & CSS <span>seit 2009</span></div>
<div>SCSS <span>seit 2013</span></div>
<div>Javascript <span>seit 2022</span></div>
<div>Rust <span>seit 2021</span></div>
<div>Python <span>seit 2021</span></div>
<div>Bash <span>seit 2015</span></div>
<div>Affinity Designer <span>20152020</span></div>
<div>Inkscape <span>seit 2020</span></div>
<div>Boxy SVG <span>seit 2022</span></div>
</section>
<section id="skills">
<h2>Kenntnisse</h1>
<div>HTML & CSS <span>seit 2009</span></div>
<div>SCSS <span>seit 2013</span></div>
<div>Javascript <span>seit 2022</span></div>
<div>Rust <span>seit 2021</span></div>
<div>Python <span>seit 2021</span></div>
<div>Bash <span>seit 2015</span></div>
<div>Affinity Designer <span>20152020</span></div>
<div>Inkscape <span>seit 2020</span></div>
<div>Boxy SVG <span>seit 2022</span></div>
</section>
</main> </main>
{{- end }} {{- end }}

View file

@ -1,6 +1,6 @@
<footer> <footer>
<span title="Revision: {{ now.Format "2. January 2006, 15:04 MST" }}">R {{ now.Format "2006-01-02" }}</span> <p title="Revision vom {{ now.Format "2. January 2006, um 15:04 Uhr MST" }}">R {{ now.Format "2006-01-02" }}</p>
{{- range .Site.Menus.footer }} {{- range .Site.Menus.footer }}
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Name }}</a>
{{- end }} {{- end }}

View file

@ -1,18 +1,28 @@
{{- $currentPage := . }} {{ $currentPage := . }}
<nav id="sidebar">
<header> <header>
{{- range .Site.Menus.name }} <p id="name">Vri 🌈</p>
<h1> <a href="{{ .URL }}">{{ .Name }}</a> </h1> <p id="information">
{{- end }} <span>@vrifox</span>
<nav> </p>
{{- range .Site.Menus.main }}
<a href="{{ .URL }}">{{ .Name }}</a>
{{- end }}
</nav>
{{- if .IsTranslated }}
<aside>
{{- range .Translations }}
<a href="{{ .Permalink }}">{{ .Site.Params.languageName }}</a>
{{- end }}
</aside>
{{- end }}
</header> </header>
<section id="sidebar-menu">
<ul>
{{- range .Site.Menus.main }}
{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}
<li class="active"><a href="{{ .URL }}">{{ .Name }}</a></li>
{{ else }}
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{ end }}
{{- end }}
</ul>
</section>
{{/*- if .IsTranslated */}}
<aside>
{{- range .Translations }}
<a href="{{ .Permalink }}">{{ .Site.Params.languageName }}</a>
{{- end }}
</aside>
{{/*- end */}}
</nav>