From 739a4af71187e82fd58956e5ad36f0baefddf3c4 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Wed, 15 Oct 2025 18:14:59 +0700 Subject: feat: improve measurements in layout --- internal/lightgallery/html_renderer.go | 6 ++-- internal/tailwind/transformer.go | 24 +++++++------- views/index.html | 6 ++-- views/layouts/general-page.html | 8 ++--- views/pages/blog-catalogue.html | 26 ++++++++-------- views/pages/blog-page.html | 10 +++--- views/pages/global-map.html | 2 +- views/pages/home-page.html | 52 +++++++++++++++---------------- views/partials/blog-page-like-button.html | 4 +-- views/partials/catalogue-blog-cards.html | 12 +++---- views/partials/general-page-footer.html | 2 +- views/partials/general-page-header.html | 8 ++--- 12 files changed, 80 insertions(+), 80 deletions(-) diff --git a/internal/lightgallery/html_renderer.go b/internal/lightgallery/html_renderer.go index f02b953..c2f785e 100644 --- a/internal/lightgallery/html_renderer.go +++ b/internal/lightgallery/html_renderer.go @@ -50,10 +50,10 @@ func (r *LightGalleryHTMLRenderer) renderLightGallery(w util.BufWriter, source [ galleryID := generateDivId(8) w.WriteString(fmt.Sprintf(` -
-
+
+
-
+
`, galleryID)) var dynamicElements []string diff --git a/internal/tailwind/transformer.go b/internal/tailwind/transformer.go index 4057ea4..f932533 100644 --- a/internal/tailwind/transformer.go +++ b/internal/tailwind/transformer.go @@ -17,44 +17,44 @@ func (t *TailwindTransformer) Transform(node *ast.Document, reader text.Reader, switch node := n.(type) { case *ast.Heading: classes := map[int]string{ - 1: "font-patua text-4xl font-bold text-main-dark mb-6 tracking-[.0125rem]", - 2: "font-spectral text-3xl font-bold text-main-dark mb-2 tracking-[.0125rem]", - 3: "font-spectral text-2xl font-medium text-main-dark mb-1.5 tracking-[.0125rem]", - 4: "font-spectral text-xl font-medium text-main-medium mb-1 tracking-[.0125rem]", - 5: "font-spectral text-base font-medium text-main-medium mb-1 italic tracking-[.0125rem]", - 6: "font-spectral text-base font-medium text-secondary mb-1", + 1: "font-patua text-4xl font-bold text-main-dark mb-3 tracking-[.0125rem]", + 2: "font-spectral text-3xl font-bold text-main-dark mb-1 tracking-[.0125rem]", + 3: "font-spectral text-2xl font-medium text-main-dark mb-0.8 tracking-[.0125rem]", + 4: "font-spectral text-xl font-medium text-main-medium mb-0.5 tracking-[.0125rem]", + 5: "font-spectral text-base font-medium text-main-medium mb-0.5 italic tracking-[.0125rem]", + 6: "font-spectral text-base font-medium text-secondary mb-0.5", } if class, ok := classes[node.Level]; ok { node.SetAttribute([]byte("class"), []byte(class)) } case *ast.Paragraph: - node.SetAttribute([]byte("class"), []byte("text-base/[2] font-spectral tracking-[.0125rem] -indent-8 ml-8 mb-8")) + node.SetAttribute([]byte("class"), []byte("text-base/[2] font-spectral tracking-[.0125rem] -indent-8 ml-4 mb-8")) case *ast.List: if node.IsOrdered() { - node.SetAttribute([]byte("class"), []byte("list-decimal list-inside space-y-2 mb-8 pl-8")) + node.SetAttribute([]byte("class"), []byte("list-decimal list-inside space-y-2 mb-4 pl-8")) } else { - node.SetAttribute([]byte("class"), []byte("list-disc list-inside space-y-2 mb-8 pl-8")) + node.SetAttribute([]byte("class"), []byte("list-disc list-inside space-y-2 mb-4 pl-8")) } case *ast.ListItem: node.SetAttribute([]byte("class"), []byte("text-base/[2] font-spectral tracking-[.0125rem]")) case *ast.Blockquote: - node.SetAttribute([]byte("class"), []byte("border-l-1 border-main-medium bg-background-dark p-2 mb-2 italic")) + node.SetAttribute([]byte("class"), []byte("border-l-2 border-main-medium bg-background-dark p-1 mb-2 italic")) case *ast.CodeSpan: node.SetAttribute([]byte("class"), []byte("bg-background-dark")) case *ast.CodeBlock, *ast.FencedCodeBlock: - node.SetAttribute([]byte("class"), []byte("bg-background-dark p-2 rounded-lg overflow-x-auto mb-8")) + node.SetAttribute([]byte("class"), []byte("bg-background-dark p-1 rounded-lg overflow-x-auto mb-4")) case *ast.Link: node.SetAttribute([]byte("class"), []byte("text-secondary hover:text-main-dark underline")) case *ast.Image: - node.SetAttribute([]byte("class"), []byte("max-w-full h-auto rounded-lg shadow-lg mb-8")) + node.SetAttribute([]byte("class"), []byte("max-w-full h-auto rounded-lg shadow-lg mb-4")) case *ast.Emphasis: switch node.Level { diff --git a/views/index.html b/views/index.html index 666b9c6..c81d4b7 100644 --- a/views/index.html +++ b/views/index.html @@ -102,14 +102,14 @@ switchTheme(savedTheme); -
-

saya.today

+
+

saya.today

{{- range .AvailableLanguages }} {{ .Alt }} {{- end }}
-

Choose your language

+

Choose your language

diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html index 2bb4034..d567711 100644 --- a/views/pages/blog-catalogue.html +++ b/views/pages/blog-catalogue.html @@ -6,42 +6,42 @@
{{ .L.BlogSearch.TagsHeader }}
-
+
{{- range .Tags }} -
+
{{- end }}
-
+
{{ .L.BlogSearch.OrderByHeader }}
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+ class="blog-cards grow flex flex-col overflow-y-auto bg-background-light inset-shadow p-6"> Loading...
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index cc00e1a..78a4b7f 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -16,12 +16,12 @@ {{ end }} {{ define "body" }} -
+
{{ .ParsedMarkdown }} {{- if .MapLocationX }} -
-
-
+
+
+
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/views/pages/global-map.html b/views/pages/global-map.html index 330790b..7d730ea 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -242,7 +242,7 @@ title: title, }).bindPopup(`
- + ${title}
${x}, ${y}
`); diff --git a/views/pages/home-page.html b/views/pages/home-page.html index 30f5ad0..9db6d23 100644 --- a/views/pages/home-page.html +++ b/views/pages/home-page.html @@ -1,52 +1,52 @@ {{ define "body" }} -
-
+
+
-

{{ .L.HomePage.Hymn1 }}

-
-

{{ .L.HomePage.Hymn2 }}

-

{{ .L.HomePage.Hymn3 }}

-

{{ .L.HomePage.Hymn4 }}

+
+

{{ .L.HomePage.Hymn2 }}

+

{{ .L.HomePage.Hymn3 }}

+

{{ .L.HomePage.Hymn4 }}

-

{{ .L.HomePage.DidYouKnowThat }}

-
+
    -
  • {{ index .FunFacts 0 }}
    • -
  • {{ index .FunFacts 1 }}
    • -
  • {{ index .FunFacts 2 }}
    • +
  • {{ index .FunFacts 0 }}
    • +
  • {{ index .FunFacts 1 }}
    • +
  • {{ index .FunFacts 2 }}
-
-
-

+

+

{{ .L.HomePage.Contacts }}

- + Telegram: @EarlInisMona - + Discord: montferrat - + E-mail: saya.andy@posteo.com
-
+
{{- range $_ := iterate .FilledHeartCount }}
♥
{{- end }} @@ -54,7 +54,7 @@
♡
{{- end }} + class="home-page-gif z-49 -rotate-12 max-w-[70%] max-h-[70%] border-4 border-(--background-dark-color) border-inset">
-

{{ .L.HomePage.SidebarDescription }}

-
+
-

{{ .L.HomePage.HomePageDescription }}

+

{{ .L.HomePage.HomePageDescription }}

-

{{ .L.HomePage.BlogSearchDescription }}

+

{{ .L.HomePage.BlogSearchDescription }}

-

{{ .L.HomePage.MarkerMapDescription }}

+

{{ .L.HomePage.MarkerMapDescription }}

-

{{ .L.HomePage.ThemeSwitchDescription }}

+

{{ .L.HomePage.ThemeSwitchDescription }}

diff --git a/views/partials/blog-page-like-button.html b/views/partials/blog-page-like-button.html index 1dfb5b8..f286471 100644 --- a/views/partials/blog-page-like-button.html +++ b/views/partials/blog-page-like-button.html @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/views/partials/catalogue-blog-cards.html b/views/partials/catalogue-blog-cards.html index f96e0f1..041f3c8 100644 --- a/views/partials/catalogue-blog-cards.html +++ b/views/partials/catalogue-blog-cards.html @@ -1,15 +1,15 @@ {{- range .BlogPages }} -
+
- -
-
- + +
+
+ {{ .Title }} // {{ .ActionDate }} -

{{ .PublishedTime }}

+

{{ .PublishedTime }}

{{ .ShortDescription }}

diff --git a/views/partials/general-page-footer.html b/views/partials/general-page-footer.html index c0774f6..8979423 100644 --- a/views/partials/general-page-footer.html +++ b/views/partials/general-page-footer.html @@ -1,5 +1,5 @@ {{ block "footer" . }}{{ end }} -

+

All the photos on saya.today are licensed under CC BY-SA 4.0 by Saya Andy © {{ .PublishedYear }}

CC diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html index d13a6d8..115ab13 100644 --- a/views/partials/general-page-header.html +++ b/views/partials/general-page-header.html @@ -1,8 +1,8 @@
- -

//

-

{{ .Title }}

+ class="flex flex-row mb-2"> + +

//

+

{{ .Title }}

{{ .PublishedDate }}

{{ block "header" . }}{{ end }} -- cgit v1.3.1+13