diff options
| author | 2025-10-19 17:02:23 +0700 | |
|---|---|---|
| committer | 2025-10-19 17:02:23 +0700 | |
| commit | 324c6df1ab878aa0c34f80c58f730e01aca1f4e9 (patch) | |
| tree | e21b27e3446c24f0fca06e1aae44b6dd925f24c6 | |
| parent | 0aeed432c4fbce4a87b56e4dcb14b25065438300 (diff) | |
| download | web-324c6df1ab878aa0c34f80c58f730e01aca1f4e9.tar.gz web-324c6df1ab878aa0c34f80c58f730e01aca1f4e9.zip | |
feat: have toolbar on the top by default (only return to left if the screen is short on height)
feat: center the layout by default
feat: switch font to Andika
feat: switch masonry to use rem units
feat: fit masonry to center
| -rw-r--r-- | internal/glightbox/html_renderer.go | 14 | ||||
| -rw-r--r-- | internal/tailwind/transformer.go | 16 | ||||
| -rw-r--r-- | static/input.css | 44 | ||||
| -rw-r--r-- | views/index.html | 10 | ||||
| -rw-r--r-- | views/layouts/general-page.html | 24 | ||||
| -rw-r--r-- | views/pages/blog-page.html | 6 | ||||
| -rw-r--r-- | views/pages/global-map.html | 7 | ||||
| -rw-r--r-- | views/pages/home-page.html | 8 | ||||
| -rw-r--r-- | views/partials/blog-page-like-button.html | 2 | ||||
| -rw-r--r-- | views/partials/general-page-footer.html | 2 | ||||
| -rw-r--r-- | views/partials/general-page-header.html | 6 |
11 files changed, 59 insertions, 80 deletions
diff --git a/internal/glightbox/html_renderer.go b/internal/glightbox/html_renderer.go index aad7984..8974ab4 100644 --- a/internal/glightbox/html_renderer.go +++ b/internal/glightbox/html_renderer.go @@ -147,25 +147,29 @@ func (r *GLightboxHTMLRenderer) renderGLightbox(w util.BufWriter, source []byte, var msnry_%s = new Masonry('.masonry-grid-%s', { itemSelector: '.grid-item-%s', columnWidth: '.grid-sizer-%s', - percentPosition: true + percentPosition: false, + fitWidth: true }); var imgLoad_%s_timer; var imgLoad_%s = imagesLoaded('.masonry-grid-%s'); - function initMasonryLayout_%s() { + function initMasonryLayout_%s(tm) { clearTimeout(imgLoad_%s_timer); - imgLoad_%s_timer = setTimeout(() => msnry_%s.layout(), 500); + imgLoad_%s_timer = setTimeout(() => msnry_%s.layout(), 300); } imgLoad_%s.on('progress', initMasonryLayout_%s); + window.addEventListener('resize', initMasonryLayout_%s); + document.addEventListener('popout', (e) => { + window.removeEventListener('resize', initMasonryLayout_%s); imgLoad_%s.off('progress', initMasonryLayout_%s); initMasonryLayout_%s = null; imgLoad_%s = null; - }); -</script>`, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID)) + }, {once: true}); +</script>`, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID)) } return ast.WalkContinue, nil diff --git a/internal/tailwind/transformer.go b/internal/tailwind/transformer.go index 23ba1a3..d4d908c 100644 --- a/internal/tailwind/transformer.go +++ b/internal/tailwind/transformer.go @@ -20,19 +20,19 @@ 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-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", + 1: "font-andika text-4xl font-bold text-main-dark mb-3 tracking-[.0125rem]", + 2: "font-andika text-3xl font-bold text-main-dark mb-1 tracking-[.0125rem]", + 3: "font-andika text-2xl font-medium text-main-dark mb-0.8 tracking-[.0125rem]", + 4: "font-andika text-xl font-medium text-main-medium mb-0.5 tracking-[.0125rem]", + 5: "font-andika text-base font-medium text-main-medium mb-0.5 italic tracking-[.0125rem]", + 6: "font-andika 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-4 mb-8")) + node.SetAttribute([]byte("class"), []byte("text-base/[2] font-andika tracking-[.0125rem] -indent-8 ml-4 mb-8")) case *ast.List: if node.IsOrdered() { @@ -42,7 +42,7 @@ func (t *TailwindTransformer) Transform(node *ast.Document, reader text.Reader, } case *ast.ListItem: - node.SetAttribute([]byte("class"), []byte("text-base/[2] font-spectral tracking-[.0125rem]")) + node.SetAttribute([]byte("class"), []byte("text-base/[2] font-andika tracking-[.0125rem]")) case *ast.Blockquote: node.SetAttribute([]byte("class"), []byte("border-l-2 border-main-medium bg-background-dark p-1 mb-2 italic")) diff --git a/static/input.css b/static/input.css index c308796..2a3b96f 100644 --- a/static/input.css +++ b/static/input.css @@ -1,8 +1,9 @@ +@import url('https://fonts.googleapis.com/css2?family=Andika:ital,wght@0,400;0,700;1,400;1,700&display=swap'); + @import "tailwindcss"; @theme { - --font-spectral: Spectral, serif; - --font-patua: "Patua One", cursive; + --font-andika: "Andika", sans-serif; --breakpoint-xs: 32rem; } @@ -242,15 +243,6 @@ a:hover, .linklike:hover { background-size: calc(var(--squares-and-triangles-background-width-coef) * 1rem) calc(var(--squares-and-triangles-background-height-coef) * 1rem); } -.logo-custom { - width: 3.5rem; - height: 20rem; - font-size: 2.5rem; - -webkit-text-stroke: 0.1rem var(--sidebar-stroke-color); - writing-mode: sideways-lr; - text-orientation: mixed; -} - .inset-shadow { box-shadow: inset 0dvh 1dvh 1dvh -1dvh rgba(75, 81, 58, 0.5), inset 1dvh 0dvh 1dvh -1dvh rgba(75, 81, 58, 0.5), @@ -399,7 +391,7 @@ a:hover, .linklike:hover { .grid-item, .grid-sizer { position: relative; display: inline-block; - width: 50%; + width: 10rem; } .grid-item-index { @@ -422,36 +414,36 @@ a:hover, .linklike:hover { } .grid-item-2x { - width: 100%; + width: 20rem; } -@container main (width >= 32rem) { +@container main (width >= 40rem) { .grid-item, .grid-sizer { - width: 33%; + width: 12rem; } .grid-item-2x { - width: 66%; + width: 24rem; } } -@container main (width >= 56rem) { +@container main (width >= 76rem) { .grid-item, .grid-sizer { - width: 25%; + width: 18rem; } .grid-item-2x { - width: 50%; + width: 36rem; } } -@container main (width >= 96rem) { +@container main (width >= 128rem) { .grid-item, .grid-sizer { - width: 20%; + width: 24rem; } .grid-item-2x { - width: 40%; + width: 48rem; } } @@ -466,7 +458,7 @@ a:hover, .linklike:hover { } .glightbox-clean .gslide-title { - font-family: var(--font-spectral) !important; + font-family: var(--font-andika) !important; font-weight: 600 !important; color: var(--main-light-color) !important; padding-bottom: 1rem !important; @@ -475,7 +467,7 @@ a:hover, .linklike:hover { .glightbox-clean .gslide-desc { font-size: 1rem !important; - font-family: var(--font-spectral) !important; + font-family: var(--font-andika) !important; font-weight: 400; color: var(--main-medium-color) !important; } @@ -540,10 +532,6 @@ body[data-theme~="ram"] .leaflet-tile { } @media (max-aspect-ratio: 0.8/1) { - .bg-sidebar { - background-size: calc(var(--squares-and-triangles-background-width-coef) * 1.6dvh) calc(var(--squares-and-triangles-background-height-coef) * 1.6dvh); - } - .ar-lt-0\.8\:bg-background-light { background-color: var(--background-light-color); } diff --git a/views/index.html b/views/index.html index 2633894..3f727ee 100644 --- a/views/index.html +++ b/views/index.html @@ -4,10 +4,6 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Choose Language // SAYA TODAY</title> - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> - <link rel="preconnect" href="https://fonts.googleapis.com"> - <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> - <link href="https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;1,200;1,300;1,400;1,500;1,600;1,700;1,800&family=Patua+One&display=swap" rel="stylesheet"> <link href="/output.css" rel="stylesheet"> <style> .menu-outer-body { @@ -56,7 +52,7 @@ </style> </head> -<body data-theme="night" class="font-spectral text-main-dark text-2xl overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col"> +<body data-theme="night" class="font-andika text-main-dark text-2xl overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col"> <div class="absolute star z-0">*</div> <div class="absolute star z-0">*</div> @@ -103,13 +99,13 @@ </script> <div class="menu-outer-body p-2 z-1 bg-background-dark flex flex-col mx-auto my-auto opacity-70"> - <p class="font-patua mx-auto text-4xl mt-1 mb-2">saya.today</p> + <p class="font-andika mx-auto text-4xl mt-1 mb-2">saya.today</p> <div class="menu-inner-body grow bg-background-light flex flex-adaptive mx-auto opacity-100"> {{- range .AvailableLanguages }} <img onclick="location.href='/{{ .Name }}';" class="object-scale-down cursor-pointer flex-1 rounded-[20%] language-icon mx-auto my-auto relative" src="{{ .Flag }}" alt="{{ .Alt }}"> {{- end }} </div> - <p class="font-spectral mx-auto text-2xl text-secondary mt-1 mb-2">Choose your language</p> + <p class="font-andika mx-auto text-2xl text-secondary mt-1 mb-2">Choose your language</p> </div> <script> diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index d874ecf..cf388de 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -4,15 +4,12 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> - <link rel="preconnect" href="https://fonts.googleapis.com"> - <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> - <link href="https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;1,200;1,300;1,400;1,500;1,600;1,700;1,800&family=Patua+One&display=swap" rel="stylesheet"> <link rel="stylesheet" href="https://f003.backblazeb2.com/file/sayana-static/libs/leaflet/1.9.4/leaflet.css"> <link rel="stylesheet" href="https://f003.backblazeb2.com/file/sayana-static/libs/glightbox/3.3.0/css/glightbox.min.css"> <link href="/output.css" rel="stylesheet"> </head> -<body data-theme="ram" class="font-spectral text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-row ar-lt-0.8:flex-col"> +<body data-theme="ram" class="font-andika text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col [@media(max-height:32rem)]:flex-row"> <script> let map = null; @@ -174,22 +171,19 @@ const clientTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; </script> - <div id="sidebar" class="bg-sidebar flex sticky flex-col ar-gt-0.8:items-center shadow-2xl z-20 w-[5rem] ar-lt-0.8:w-[100dvw] h-[100dvh] ar-lt-0.8:h-[8dvh]"> - <div class="logo-custom block ar-lt-0.8:hidden [@media(max-height:32rem)]:hidden text-sidebar font-patua font-extrabold text-center relative z-20"> - saya.today - </div> - <div class="text-[3rem] ar-lt-0.8:text-[5dvh] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1dvw] flex flex-col ar-lt-0.8:flex-row gap-0 relative z-20"> - <a href="/{{ .Lang }}" class="w-[5rem] ar-lt-0.8:w-[8dvh] h-[5rem] ar-lt-0.8:h-[8dvh]"> + <div id="sidebar" class="bg-sidebar flex sticky flex-col shadow-2xl z-20 w-[100dvw] xs:w-[90dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] [@media(max-height:32rem)]:w-[5rem] h-[5rem] [@media(max-height:32rem)]:h-[100dvh] mx-auto [@media(max-height:32rem)]:mx-0"> + <div class="text-[3rem] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1dvw] flex flex-row [@media(max-height:32rem)]:flex-col gap-0 relative z-20"> + <a href="/{{ .Lang }}" class="w-[5rem] h-[5rem]"> <i onclick="return changeUrl('/{{ .Lang }}');" class="fas fa-home flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i> </a> - <a href="/{{ .Lang }}/blog" class="w-[5rem] ar-lt-0.8:w-[8dvh] h-[5rem] ar-lt-0.8:h-[8dvh]"> + <a href="/{{ .Lang }}/blog" class="w-[5rem] h-[5rem]"> <i onclick="return changeUrl('/{{ .Lang }}/blog');" class="fas fa-search flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i> </a> - <a href="/{{ .Lang }}/map" class="w-[5rem] ar-lt-0.8:w-[8dvh] h-[5rem] ar-lt-0.8:h-[8dvh]"> + <a href="/{{ .Lang }}/map" class="w-[5rem] h-[5rem]"> <i class="fas fa-map flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i> </a> - <i onclick="toggleThemeWheel();" id="theme-button" class="fas fa-swatchbook flex w-[5rem] ar-lt-0.8:w-[8dvh] h-[5rem] ar-lt-0.8:h-[8dvh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg"></i> - <a href="./" class="hidden max-xs:block [@media(max-height:32rem)]:block w-[5rem] ar-lt-0.8:w-[8dvh] h-[5rem] ar-lt-0.8:h-[8dvh]"> + <i onclick="toggleThemeWheel();" id="theme-button" class="fas fa-swatchbook flex w-[5rem] h-[5rem] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 rounded-lg"></i> + <a href="./" class="hidden max-xs:block [@media(max-height:32rem)]:block w-[5rem] h-[5rem]"> <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left flex w-full h-full content-center text-center text-sidebar hover:bg-background-dark transition-colors duration-300 rounded-lg"></i> </a> </div> @@ -202,7 +196,7 @@ </div> </div> - <div class="bg-background-dark @container/main flex z-10 ar-lt-0.8:w-[100dvw] w-[90dvw] xs:w-[85dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] grow-0 h-[100dvh] ar-lt-0.8:max-h-[92dvh]"> + <div class="bg-background-dark @container/main flex z-10 w-[100dvw] xs:w-[90dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] grow-0 h-[calc(100dvh-5rem)] [@media(max-height:32rem)]:h-[100dvh] mx-auto [@media(max-height:32rem)]:mx-0"> <div class="bg-background-dark border-r-2 border-dashed border-main-dark"></div> <div class="max-h-100% flex flex-col grow bg-background-dark relative pt-4 ml-8 pr-4"> diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index 77164fa..3e642fa 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -1,8 +1,8 @@ {{ define "body" }} <div class="bg-background-light flex flex-col inset-shadow px-8 py-4 overflow-y-auto"> - <p class="max-xs:block [@media(max-height:32rem)]:block hidden font-spectral text-2xl font-bold italic text-main-dark tracking-[.0125rem] mb-1">{{ .Title }}</p> - <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-spectral text-secondary">{{ .L.Metadata.Published }}: {{ .PublishedDate }}</p> - <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-spectral text-secondary">{{ .L.Metadata.Action }}: {{ .ActionDate }}</p> + <p class="max-xs:block [@media(max-height:32rem)]:block hidden font-andika text-2xl font-bold italic text-main-dark tracking-[.0125rem] mb-1">{{ .Title }}</p> + <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-andika text-secondary">{{ .L.Metadata.Published }}: {{ .PublishedDate }}</p> + <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-andika text-secondary">{{ .L.Metadata.Action }}: {{ .ActionDate }}</p> <hr class="max-xs:block [@media(max-height:32rem)]:block hidden border-t-2 border-dotted border-main-dark mt-1 mb-2 w-full ml-auto mr-auto"> {{ .ParsedMarkdown }} {{- if .MapLocationX }} diff --git a/views/pages/global-map.html b/views/pages/global-map.html index 686b46b..1801291 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -5,9 +5,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>{{ .L.GlobalMap.Header }} // SAYA TODAY</title> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> - <link rel="preconnect" href="https://fonts.googleapis.com"> - <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> - <link href="https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;1,200;1,300;1,400;1,500;1,600;1,700;1,800&family=Patua+One&display=swap" rel="stylesheet"> {{ block "header" . }}{{ end }} <link href="/output.css" rel="stylesheet"> <link rel="stylesheet" href="https://f003.backblazeb2.com/file/sayana-static/libs/leaflet/1.9.4/leaflet.css"> @@ -15,7 +12,7 @@ <link rel="stylesheet" href="https://f003.backblazeb2.com/file/sayana-static/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css"> </head> -<body data-theme="ram" class="font-spectral text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-row ar-lt-0.8:flex-col"> +<body data-theme="ram" class="font-andika text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-row ar-lt-0.8:flex-col"> <script> function switchTheme(theme) { @@ -45,7 +42,7 @@ </script> <div id="sidebar" class="bg-sidebar flex sticky flex-col ar-gt-0.8:items-center shadow-2xl z-20 w-[5rem] ar-lt-0.8:w-[100dvw] h-[100dvh] ar-lt-0.8:h-[8dvh]"> - <div class="logo-custom ar-lt-0.8:hidden text-sidebar font-patua font-extrabold text-center relative z-20"> + <div class="logo-custom ar-lt-0.8:hidden text-sidebar font-andika font-extrabold text-center relative z-20"> saya.today </div> <div class="text-[3rem] ar-lt-0.8:text-[5dvh] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1dvw] flex flex-col ar-lt-0.8:flex-row gap-0 relative z-20"> diff --git a/views/pages/home-page.html b/views/pages/home-page.html index 95093a0..b39b65c 100644 --- a/views/pages/home-page.html +++ b/views/pages/home-page.html @@ -2,7 +2,7 @@ <div class="bg-background-light flex flex-row ar-lt-0.6:flex-col w-full h-full inset-shadow overflow-y-auto text-base/[2] tracking-wide"> <div class="ar-gt-0.6:flex-3/5 justify-center content-start p-8"> <div class="flex flex-col justify-start items-start bg-background-dark mb-8"> - <p class="text-3xl/[2] sm:text-4xl/[2] lg:text-5xl/[2] ml-4 tracking-widest uppercase w-full font-spectral italic text-left + <p class="text-3xl/[2] sm:text-4xl/[2] lg:text-5xl/[2] ml-4 tracking-widest uppercase w-full font-andika italic text-left border-l-1.5 border-solid border-(--background-dark-color) bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.Hymn1 }}</p> <hr class="w-full border-t-2 border-dotted border-main-dark mb-1"> @@ -12,7 +12,7 @@ </div> <div class="flex flex-col justify-center items-center"> - <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-spectral italic text-left + <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-andika italic text-left border-l-1.5 border-solid border-(--background-dark-color) bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.DidYouKnowThat }}</p> <hr class="w-full border-t-2 border-dotted border-main-dark mb-1"> @@ -26,7 +26,7 @@ <div class="ar-gt-0.6:flex-2/5 justify-center content-start p-8"> <div class="flex flex-col justify-center items-start mb-4"> - <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-spectral italic text-left + <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-andika italic text-left border-l-1.5 border-solid border-(--background-dark-color) bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.Contacts }}</p> <a href="https://t.me/EarlInisMona"> @@ -100,7 +100,7 @@ </script> <div class="flex flex-col justify-center items-center"> - <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-spectral italic text-left + <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-andika italic text-left border-l-1.5 border-solid border-(--background-dark-color) bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.SidebarDescription }}</p> <hr class="w-full border-t-2 border-dotted border-main-dark mb-1"> diff --git a/views/partials/blog-page-like-button.html b/views/partials/blog-page-like-button.html index f23ef9d..bcf3d0b 100644 --- a/views/partials/blog-page-like-button.html +++ b/views/partials/blog-page-like-button.html @@ -1,6 +1,6 @@ <button hx-put="/api/v1/like" hx-vals='{"like": {{ not .Liked }}}' hx-target="this" hx-swap="outerHTML" hx-trigger="click" - class="text-sm/[0.9] shrink-0 font-spectral text-left px-1 py-0.5 {{ if .Liked }}bg-main-light hover:bg-main-medium text-background-dark border-inset{{ else }}bg-main-dark hover:bg-main-medium text-background-light border-outset{{ end }} cursor-pointer border-2 border-background-dark"> + class="text-sm/[0.9] shrink-0 font-andika text-left px-1 py-0.5 {{ if .Liked }}bg-main-light hover:bg-main-medium text-background-dark border-inset{{ else }}bg-main-dark hover:bg-main-medium text-background-light border-outset{{ end }} cursor-pointer border-2 border-background-dark"> <i class="fas fa-thumbs-up w-3 h-3"></i> <span class="italic ml-0.5 text-background-light">({{ .LikedCount }})</span> </button>
\ No newline at end of file diff --git a/views/partials/general-page-footer.html b/views/partials/general-page-footer.html index 8979423..9b91bf0 100644 --- a/views/partials/general-page-footer.html +++ b/views/partials/general-page-footer.html @@ -1,5 +1,5 @@ {{ block "footer" . }}{{ end }} -<p class="grow content-center text-base/[1] font-spectral italic text-right text-secondary mr-1"> +<p class="grow content-center text-base/[1] font-andika italic text-right text-secondary mr-1"> All the photos on <a href="https://saya.today/">saya.today</a> are licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a> by <a href="https://t.me/EarlInisMona">Saya Andy</a> © {{ .PublishedYear }} </p> <img class="max-w-4 max-h-4 self-center" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="CC"> diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html index e5488b4..d74c5c9 100644 --- a/views/partials/general-page-header.html +++ b/views/partials/general-page-header.html @@ -3,8 +3,8 @@ <a href="./" class="w-(--text-4xl) h-(--text-4xl) mx-1 my-auto"> <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left hover:bg-main-dark hover:bg-opacity-10 cursor-pointer transition-colors duration-300 rounded-md text-4xl"></i> </a> - <p class="text-4xl font-spectral italic font-extrabold select-none my-auto pl-3 pr-3">//</p> - <p class="text-4xl font-spectral italic text-left mt-auto">{{ .Title }}</p> - <p id="published-date" class="grow text-2xl font-spectral text-secondary text-right mt-auto">{{ .PublishedDate }}</p> + <p class="text-4xl font-andika italic font-extrabold select-none my-auto pl-3 pr-3">//</p> + <p class="text-4xl font-andika italic text-left mt-auto">{{ .Title }}</p> + <p id="published-date" class="grow text-2xl font-andika text-secondary text-right mt-auto">{{ .PublishedDate }}</p> </div> {{ block "header" . }}{{ end }} |