summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------site0
-rw-r--r--src/assets/blog/2025-02-24.md4
-rw-r--r--src/assets/blog/2025-03-11.md4
-rw-r--r--src/public/img/background.jpgbin3512 -> 0 bytes
-rw-r--r--src/public/img/background.pngbin11400 -> 15331 bytes
-rw-r--r--src/scss/blog.scss6
-rw-r--r--src/scss/main.scss43
-rw-r--r--src/web/_model/blog.php2
-rw-r--r--src/web/_views/blog/rss.php3
-rw-r--r--src/web/_views/footer.php9
-rw-r--r--src/web/_views/header.php2
-rw-r--r--src/web/lang/common.php13
-rw-r--r--src/web/lib/image.php6
13 files changed, 78 insertions, 14 deletions
diff --git a/site b/site
-Subproject 9785d11c54535ac897755a2603f67ce209abc2c
+Subproject 15a66eed399262b5f78c71bce46a9d5738338d7
diff --git a/src/assets/blog/2025-02-24.md b/src/assets/blog/2025-02-24.md
index 6d2bf93..88bf891 100644
--- a/src/assets/blog/2025-02-24.md
+++ b/src/assets/blog/2025-02-24.md
@@ -257,8 +257,8 @@ to use that. There is alot about guix that I love, but I ran into too many
problems. I am able to have my declarative system with nix without the hassle
of guix.
-You can see my guix configuration [here](https://g.freya.cat/freya/dotfiles-guix)
-and my nix configuration [here](https://g.freya.cat/freya/dotfiles-nix). If you
+For reference here are the links to my [guix configurationhere](https://g.freya.cat/freya/dotfiles-guix)
+and my [nix configuration](https://g.freya.cat/freya/dotfiles-nix). If you
are trying to learn or switch to either system, you can use them as a good
resource. You can also view the guix repository I created called [sakura](https://g.freya.cat/freya/sakura)
when I had to package things. If you need a recommendation to use either GUIX
diff --git a/src/assets/blog/2025-03-11.md b/src/assets/blog/2025-03-11.md
index 39f554d..412314f 100644
--- a/src/assets/blog/2025-03-11.md
+++ b/src/assets/blog/2025-03-11.md
@@ -72,7 +72,7 @@ In an itemized list this guide will:
Flauncher is a launcher (default user interface) for Google TVs. It is simple
and just shows the installed apps on the tv, no ads, nothing else. I am using a
fork of flauncher that includes some fixes and improvements, but you can also
-just use the original [here](https://gitlab.com/flauncher/flauncher).
+[just use the original](https://gitlab.com/flauncher/flauncher).
2. Removing all preinstalled applications
@@ -191,7 +191,7 @@ adb shell pm enable --user 0 com.mediatek.wwtv.tvcenter
```
If that doesnt work try looking at the path `/system_ext/priv-app/LiveTV` as
-that is where I found the apk. I also have a mirror for it [here](/public/blog/LiveTV.apk).
+that is where I found the apk. [I also have a mirror for it](/public/blog/LiveTV.apk).
#### 2. Removing preloaded applications
diff --git a/src/public/img/background.jpg b/src/public/img/background.jpg
deleted file mode 100644
index 79a8a12..0000000
--- a/src/public/img/background.jpg
+++ /dev/null
Binary files differ
diff --git a/src/public/img/background.png b/src/public/img/background.png
index ea5fc7e..5b58f01 100644
--- a/src/public/img/background.png
+++ b/src/public/img/background.png
Binary files differ
diff --git a/src/scss/blog.scss b/src/scss/blog.scss
index 6fad483..665c5a4 100644
--- a/src/scss/blog.scss
+++ b/src/scss/blog.scss
@@ -17,6 +17,12 @@
max-width: $page-width - $outer-gap * 2 - $inner-gap;
}
+ code {
+ display: inline-block;
+ max-width: 100%;
+ overflow-x: scroll;
+ }
+
img {
margin: $inner-gap;
max-width: 100%;
diff --git a/src/scss/main.scss b/src/scss/main.scss
index b9ef3ee..362e6b9 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -38,6 +38,15 @@ h1 {
font-size: 325%;
line-height: 100%;
margin: 15px 0;
+
+ @media (max-width: 400px) {
+ font-size: 300%;
+ margin: 12px 0;
+ }
+
+ @media (max-width: 340px) {
+ font-size: 250%;
+ }
}
h2 {
@@ -45,6 +54,15 @@ h2 {
font-size: 200%;
line-height: 100%;
margin: 12px 0;
+
+ @media (max-width: 400px) {
+ font-size: 175%;
+ margin: 9px 0;
+ }
+
+ @media (max-width: 340px) {
+ font-size: 165%;
+ }
}
h3 {
@@ -52,6 +70,15 @@ h3 {
font-size: 150%;
line-height: 100%;
margin: 5px 0;
+
+ @media (max-width: 400px) {
+ font-size: 125%;
+ margin: 4px 0;
+ }
+
+ @media (max-width: 340px) {
+ font-size: 120%;
+ }
}
h4 {
@@ -59,6 +86,14 @@ h4 {
font-size: 130%;
line-height: 100%;
margin: 2px 0;
+
+ @media (max-width: 400px) {
+ font-size: 120%;
+ }
+
+ @media (max-width: 340px) {
+ font-size: 115%;
+ }
}
a,
@@ -76,13 +111,13 @@ html {
color: $white;
font-family: $font;
font-size: 120%;
- background: #181818;
}
body {
- background-image: url("../img/background.jpg?ref=2");
+ background-image: url("../img/background.png?ref=3");
background-repeat: repeat;
background-size: 512px;
+ background-color: #181818;
}
.center {
@@ -361,3 +396,7 @@ body {
}
}
}
+
+#main #ad {
+ padding: $inner-gap;
+}
diff --git a/src/web/_model/blog.php b/src/web/_model/blog.php
index 6446564..cabbc9f 100644
--- a/src/web/_model/blog.php
+++ b/src/web/_model/blog.php
@@ -42,7 +42,7 @@ class Blog_model extends Model {
$base = $this->get_url('');
$replace = "<a href=\"{$base}\\1\">";
- $replace .= ie('<center>') . "<img class=\"center\" src=\"{$base}\\1\" title=\"\\2\" alt=\"\\2\">" . ie('</center>');
+ $replace .= ie('<center>') . "<img class=\"center\" src=\"{$base}\\1\" alt=\"\\2\">" . ie('</center>');
$replace .= "</a>";
$md = preg_replace($pattern, $replace, $md);
diff --git a/src/web/_views/blog/rss.php b/src/web/_views/blog/rss.php
index 121b747..830ae34 100644
--- a/src/web/_views/blog/rss.php
+++ b/src/web/_views/blog/rss.php
@@ -1,5 +1,6 @@
<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<rss version="2.0">
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<title><?=lang('title')?></title>
<link><?=$this->get_url('blog')?></link>
diff --git a/src/web/_views/footer.php b/src/web/_views/footer.php
index 067bb2a..a22959e 100644
--- a/src/web/_views/footer.php
+++ b/src/web/_views/footer.php
@@ -7,6 +7,11 @@
$footer_text = '';
}
?>
+ <div id="ad" class="section ad-slot" role="region">
+ <span class="ad-slot">
+ <?=lang('adblock_notice')?>
+ </span>
+ </div>
</div>
</div>
<div id="footer" role="contentinfo" aria-label="footer">
@@ -23,10 +28,10 @@
<?=image('buttons/vim', 'alt_button_vim', animated: TRUE, width: '88', height: '30')?>
<?=image('buttons/gnu-linux', 'alt_button_gnu_linux', width: '88', height: '30')?>
<a href="https://www.eff.org/join">
- <?=image('buttons/eff', 'alt_button_eff', width: '96', height: '30')?>
+ <?=image('buttons/eff', 'alt_button_eff', 'title_button_eff', width: '96', height: '30')?>
</a>
<a href="https://citrons.xyz/a/memetic-apioform-page.html">
- <?=image('buttons/apiopage', 'alt_button_apiopage', width: '81', height: '30')?>
+ <?=image('buttons/apiopage', 'alt_button_apiopage', 'title_button_apiopage', width: '81', height: '30')?>
</a>
</div>
<br>
diff --git a/src/web/_views/header.php b/src/web/_views/header.php
index f6b4740..5eb528a 100644
--- a/src/web/_views/header.php
+++ b/src/web/_views/header.php
@@ -7,7 +7,7 @@
<?=ie('<center>')?>
<div class="center">
<div id="header" role="banner" aria-label="banner">
- <?=image('img/headerLogo', 'alt_website_logo', size: '200')?>
+ <?=image('img/headerLogo', 'alt_website_logo', 'title_website_logo', size: '200')?>
<div class="content">
<h1 class="logo-text">
<?=lang('first_name')?>
diff --git a/src/web/lang/common.php b/src/web/lang/common.php
index aef1ede..16e0f74 100644
--- a/src/web/lang/common.php
+++ b/src/web/lang/common.php
@@ -22,10 +22,15 @@ $lang['action_blog_tip'] = 'View my blog';
$lang['alt_button_eyes'] = 'Best viewed with eyes';
$lang['alt_button_vim'] = 'Edited with VIM';
$lang['alt_button_gnu_linux'] = 'Made with GNU/Linux';
-$lang['alt_button_eff'] = 'Support the Electronic Frontier Foundation!';
+$lang['alt_button_eff'] = 'Electronic Frontier Foundation logo';
$lang['alt_button_apiopage'] = 'Memetic apiopage';
$lang['alt_website_logo'] = 'Website Logo';
+# common title text
+$lang['title_button_eff'] = 'Support the Electronic Frontier Foundation!';
+$lang['title_button_apiopage'] = 'Click for more memetic apiopage\'s';
+$lang['title_website_logo'] = 'Freya';
+
# misc
$lang['john_title'] = 'Johnvertisement';
$lang['bucket_title'] = 'Bucket Webring';
@@ -33,7 +38,7 @@ $lang['license_pre'] = 'This site is licensed under the';
$lang['copyright'] = 'Copyright (c)';
# footer_text
-$lang ['footer_text'] = [
+$lang['footer_text'] = [
"Always look on the bright side of life",
"🐝 powder",
"Submit to john",
@@ -53,3 +58,7 @@ $lang ['footer_text'] = [
"Help im stuck inside footer text!",
"abort: no x11 display server found",
];
+
+$lang['adblock_notice'] = "You aren't using an adblocker! Install
+ <a href='https://chromewebstore.google.com/detail/ublock-origin-lite/ddkjiahejlhfcafbddmgiahcphecmpfh'>uBlock Origin Lite (Chrome)</a> or
+ <a href='<C-2-LeftMouse>'>uBlock Origin (Firefox)</a>.";
diff --git a/src/web/lib/image.php b/src/web/lib/image.php
index 7b6ec0e..a36b985 100644
--- a/src/web/lib/image.php
+++ b/src/web/lib/image.php
@@ -41,6 +41,7 @@ function __make_source(
function image(
$name,
$alt,
+ $title = NULL,
$formats = array('webp', 'png'),
$animated = FALSE,
$attrs = array(),
@@ -75,7 +76,10 @@ function image(
if ($alt) {
$alt = lang($alt);
$attrs['alt'] = $alt;
- $attrs['title'] = $alt;
+ }
+ if ($title) {
+ $title = lang($title);
+ $attrs['title'] = $title;
}
if ($width) {
$attrs['width'] = $width;
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-02-25 16:16:38 +0000