Approximately shove new templates onto old site

This commit is contained in:
akp 2024-12-30 00:25:54 +00:00
parent 5243815b51
commit cb839e2d5c
No known key found for this signature in database
GPG key ID: CF8D58F3DEB20755
11 changed files with 107 additions and 67 deletions

View file

@ -7,17 +7,6 @@ person:
baseURL: "https://www.akpain.net"
menu:
- url: "/blog/"
title: "Blog"
name: "blog"
- url: "/projects/"
title: "Projects"
name: "projects"
- url: "/now/"
title: "What I'm up to now"
name: "now"
meta:
siteName: "abi abi"
themeColour: "#df3062"

View file

@ -1,8 +1,4 @@
<section class="page__aside">
<div class="aside__about">
<h1 class="about__title">{{ site.person.firstName }} {{ site.person.surname }}</h1>
<p class="about__description small-margin">she/her</p>
<p class="about__description small-margin">UK-based programmer, photographer and Computer Science student</p>
</div>
<img src="/assets/img/avatar.png" alt="Abi's avatar" style="max-width: 200px; aspect-ratio: 1/1;">
</section>
<h1 class="h2" style="margin-bottom: 0.1em">{{ site.person.firstName }} {{ site.person.surname }}</h1>
<span>she/her</span>
<p class="about__description small-margin">UK-based programmer, photographer and Computer Science student</p>
<img src="/assets/img/avatar.png" alt="Abi's avatar" style="max-width: 200px; aspect-ratio: 1/1;">

View file

@ -1,8 +1,16 @@
<p class="copyright">&copy; 2019 - {{ site.build.date.year }} Abigail Pain. Written content licensed as <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="_blank" rel="license noopener noreferrer">CC BY-NC 4.0</a></p>
<p>No AI was used in the creation of this content. See this site's <a href="/credits">credits</a>.</p>
<div class="padding"></div>
<img src="/assets/img/graphics/altbutton.png" alt="akpain.net button">
<br>
<a href="/blog/the-modern-web-sucks"><img src="/assets/img/graphics/stamp-yrownwebsite.png" alt="maybe you should make your own website" title="Maybe you should make your own website"></a>
<footer>
<div class="content">
&copy; 2019 - 2024 Abigail Pain<br>
Written content licensed under the CC BY-NC 4.0
<p class="copyright">&copy; 2019 - {{ site.build.date.year }} Abigail Pain. Written content licensed as <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="_blank" rel="license noopener noreferrer">CC BY-NC 4.0</a></p>
<p>No AI was used in the creation of this content. See this site's <a href="/credits">credits</a>.</p>
<div class="padding"></div>
<img src="/assets/img/graphics/altbutton.png" alt="akpain.net button">
<br>
<a href="/blog/the-modern-web-sucks"><img src="/assets/img/graphics/stamp-yrownwebsite.png" alt="maybe you should make your own website" title="Maybe you should make your own website"></a>
</div>
</footer>

View file

@ -1,22 +1,17 @@
<meta charset="UTF-8"/>
<title>{% if page.title %}{{ page.title }} :: {% endif %}{{ site.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
{% if page.description %}<meta name="description" content="{{ page.description }}"><meta property="og:description" content="{{ page.description }}">{% endif %}
{% if page.canonicalURL %}<link rel="canonical" href="{{ page.canonicalURL }}">{% endif %}
{% if page.imageURL %}<meta property="og:image" content="{{ page.imageURL }}">{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1">
{% if page.imageURL %}<meta property="og:image" content="{{ page.imageURL }}">{% endif %}
{% if site.meta.themeColour %}<meta name="theme-color" content="{{ site.meta.themeColour }}">{% endif %}
{% if site.meta.siteName %}<meta property="og:site_name" content="{{ site.meta.siteName }}">{% endif %}
<meta property="og:type" content="website">
{# <link rel="stylesheet" href="/assets/fontawesome/css/all.min.css"> #}
<link rel="stylesheet" href="/assets/css/risotto.css">
<link rel="stylesheet" href="/assets/css/custom.css">
{# <!-- favicon -->
{{ if os.FileExists "static/favicon.ico" }}<link rel="icon" href="{{ "favicon.ico" | absURL }}">{{ end }}
{{ if os.FileExists "static/favicon-32x32.png" }}<link rel="icon" type="image/png" sizes="32x32" href="{{ "favicon-32x32.png" | absURL }}">{{ end }}
{{ if os.FileExists "static/favicon-16x16.png" }}<link rel="icon" type="image/png" sizes="16x16" href="{{ "favicon-16x16.png" | absURL }}">{{ end }}
{{ if os.FileExists "static/apple-touch-icon.png" }}<link rel="apple-touch-icon" href="{{ "apple-touch-icon.png" | absURL }}">{{ end }}
{{ if os.FileExists "static/site.webmanifest" }}<link rel="manifest" href="{{ "site.webmanifest" | absURL }}">{{ end }} #}
<!-- // TODO: favicon! -->
<link rel="stylesheet" href="/assets/css/main.css">
<link rel="stylesheet" href="/assets/css/custom.css">

View file

@ -1,8 +0,0 @@
<nav class="page__nav main-nav">
<ul>
<h1 class="page__logo"><a href="/" class="page__logo-inner">{{ site.title | lower }}</a></h1>
{% for item in items %}
<li class="main-nav__item"><a class="nav-main-item" href="{{ item.url }}" {% if item.title %}title="{{ item.title }}"{% endif %}>{{ item.name }}</a></li>
{% endfor %}
</ul>
</nav>

View file

@ -0,0 +1,11 @@
<nav>
<div class="content">
<a href="/" class="font--monospace-regular brand-label">[abi abi] $</a>
<ul>
<li class="nav-control"><a href="#"><label for="menu-toggle"><span class="menu-toggle-close-label">close </span>menu</label></a><input type="checkbox" id="menu-toggle"></li>
<li><a href="/blog/" title="Blog">blog</a></li>
<li><a href="/projects/" title="Projects">projects</a></li>
<li><a href="/now/" title="What I'm up to now">now</a></li>
</ul>
</div>
</nav>

View file

@ -1,31 +1,19 @@
<!DOCTYPE html>
<html lang="en-GB">
<!-- Built from commit {{ site.build.hash }} {{ site.build.date.isoformat() }} -->
<head>
<head>
{% include "_includes/head.html" %}
{% block head %}{% endblock %}
</head>
<body>
{% block body %}
<div class="page{% if page.showAside %} with-aside{% endif %}">
<header class="page__header">
{% with items = site.menu %}{% include "_includes/header.html" %}{% endwith %}
</header>
<section class="page__body">
{% block main %}{% endblock %}
</section>
{% if page.showAside %}
{% include "_includes/aside.html" %}
{% endif %}
<footer class="page__footer">
{% include "_includes/footer.html" %}
</footer>
</div>
{% include "_includes/nav.html" %}
<main>
<div id="main-content">{% block main %}{% endblock %}</div>
<div id="main-aside" class="text--secondary">{% block aside %}{% endblock %}</div>
</main>
{% include "_includes/footer.html" %}
{% endblock body %}
</body>

View file

@ -13,6 +13,10 @@ showAside: true
</style>
{% endblock %}
{% block aside %}
{% include "_includes/aside.html" %}
{% endblock %}
{% block main %}
<h1>Hi there!</h1>
@ -34,6 +38,25 @@ showAside: true
<p>If you'd like to send me an email, feel free to drop me a message at <code><noscript>hello at this domain</noscript><span id="scrambled"></span></code>.</p>
<h1>TODO</h1>
<ul>
<li>Blockquotes are broken</li>
<li>Integration with rendered markdown needs work</li>
<li>go through EVERY PAGE AND CHECK</li>
<li>the footer</li>
<li>blog has special things going on that need looking at
<ul>
<li>monospaced inter version is not a thing (yet)</li>
<li>local copies of fonts pleaseeeeeeee</li>
<li>if we're going to build a toc box then we need to actually integrate the fucker</li>
</ul>
</li>
<li>what the fuck was in that custom.css file</li>
<li>favicon</li>
<li>i think lists need tweaking</li>
</ul>
<script>
String.prototype.replaceAt = function(index, replacement) {
return this.substring(0, index) + replacement + this.substring(index + replacement.length);

View file

@ -74,7 +74,7 @@ canonicalURL: "/photography/"
</div>
</div>
<h3>Retired Cameras</h3>
<h2>Retired Cameras</h2>
<div class="block">
<h3>Pentax Espio 115M</h3>

36
site/css/_custom.scss Normal file
View file

@ -0,0 +1,36 @@
// TODO: review the contents of this file
html {
min-height: calc(100% - 2 * 3px);
border: 3px solid var(--brand);
}
/* used in the blog listings */
b.favourite > a::before {
content: "";
}
img.border {
border: 1px solid var(--off-fg);
}
div.rendered-markdown figcaption {
font-style: italic;
color: var(--muted);
text-align: center;
}
div.rendered-markdown section.footnotes li p {
margin-bottom: 0px;
}
div.rendered-markdown section.footnotes p > a:last-of-type {
padding-left: 5px;
}
div.rendered-markdown div.projects img {
display: block;
/* margin: auto; */
max-width: 70%;
padding-bottom: 5px;
}

View file

@ -1,3 +1,5 @@
@use "_layout.scss";
@use "_typography.scss";
@use "_components.scss";
@use "_custom.scss";