Merge branch 'dev'

This commit is contained in:
ClovertaTheTrilobita 2026-04-17 13:42:39 +03:00
commit e96ccb6841
2 changed files with 13 additions and 3 deletions

View file

@ -2,7 +2,11 @@
import Footer from "@/components/Footer.astro"; import Footer from "@/components/Footer.astro";
import Header from "@/components/Header.astro"; import Header from "@/components/Header.astro";
import { ClientRouter } from "astro:transitions"; import { ClientRouter } from "astro:transitions";
import { slide, fade } from "astro:transitions"; import { fade } from "astro:transitions";
import { getLangFromUrl } from "@/i18n";
const lang = getLangFromUrl(Astro.url);
const htmlLang = lang === "zh" ? "zh-CN" : "en-US";
import SEO from "@/components/SEO.astro"; import SEO from "@/components/SEO.astro";
import FloatingActions from "@/components/FloatingActions.astro"; import FloatingActions from "@/components/FloatingActions.astro";
import Spinner from "@/components/Spinner.astro"; import Spinner from "@/components/Spinner.astro";
@ -15,7 +19,7 @@ const {
--- ---
<!doctype html> <!doctype html>
<html lang="en"> <html lang={htmlLang}>
<head> <head>
<ClientRouter /> <ClientRouter />
<meta charset="UTF-8" /> <meta charset="UTF-8" />

View file

@ -34,7 +34,13 @@ article svg[id^="mermaid-"] {
html { html {
/* font-family: "Maple Mono", "Maple Mono CN", monospace; */ /* font-family: "Maple Mono", "Maple Mono CN", monospace; */
font-family: 'Noto Serif SC', serif; font-family:
"Noto Serif SC",
"Source Han Serif SC",
"Songti SC",
"STSong",
"SimSun",
serif;
font-weight: 500; font-weight: 500;
/* background-color: #ffffff; */ /* background-color: #ffffff; */
background-color: #F9F2ED; background-color: #F9F2ED;