diff --git a/layout/layout.pixy b/layout/layout.pixy index 09859ab4..3ab5cb01 100644 --- a/layout/layout.pixy +++ b/layout/layout.pixy @@ -1,7 +1,10 @@ component Layout(app *aero.Application, ctx *aero.Context, user *arn.User, openGraph *arn.OpenGraph, content string) html(lang="en") head - title= app.Config.Title + if openGraph != nil + title= openGraph.Tags["og:title"] + else + title= app.Config.Title meta(name="viewport", content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes") meta(name="theme-color", content=app.Config.Manifest.ThemeColor) diff --git a/pages/anime/anime.go b/pages/anime/anime.go index 6c2ea54d..a3ad71e9 100644 --- a/pages/anime/anime.go +++ b/pages/anime/anime.go @@ -11,6 +11,7 @@ import ( const maxEpisodes = 26 const maxEpisodesLongSeries = 5 +const maxDescriptionLength = 170 // Get anime page. func Get(ctx *aero.Context) string { @@ -40,16 +41,23 @@ func Get(ctx *aero.Context) string { } // Open Graph + description := anime.Summary + + if len(description) > maxDescriptionLength { + description = description[:maxDescriptionLength-3] + "..." + } + openGraph := &arn.OpenGraph{ Tags: map[string]string{ "og:title": anime.Title.Canonical, "og:image": anime.Image.Large, "og:url": "https://" + ctx.App.Config.Domain + anime.Link(), "og:site_name": "notify.moe", - "og:description": anime.Summary, + "og:description": description, }, Meta: map[string]string{ - "description": anime.Summary, + "description": description, + "keywords": anime.Title.Canonical + ",anime", }, } diff --git a/pages/anime/anime.pixy b/pages/anime/anime.pixy index 72f14599..8dc41907 100644 --- a/pages/anime/anime.pixy +++ b/pages/anime/anime.pixy @@ -7,13 +7,13 @@ component Anime(anime *arn.Anime, tracks []*arn.SoundTrack, user *arn.User, epis .space .anime-info - h2.anime-title(title=anime.Type)= anime.Title.Canonical + h1.anime-title(title=anime.Type)= anime.Title.Canonical //- if user && user.titleLanguage === "japanese" //- span.second-title(title=anime.Title.English !== anime.Title.Romaji ? anime.Title.English : null)= anime.Title.Romaji //- else if anime.Title.Japanese != anime.Title.Canonical - .anime-alternative-title + h2.anime-alternative-title a(href="http://jisho.org/search/" + anime.Title.Japanese, target="_blank", title="Look up reading on jisho.org", rel="nofollow")= anime.Title.Japanese //- h3.anime-section-name.anime-summary-header Summary diff --git a/pages/anime/anime.scarlet b/pages/anime/anime.scarlet index b1eb03fb..c02f0ade 100644 --- a/pages/anime/anime.scarlet +++ b/pages/anime/anime.scarlet @@ -38,7 +38,11 @@ .anime-alternative-title font-size 0.9em + margin-top 0 margin-bottom 0.5rem + text-align left + font-weight normal + line-height content-line-height a color rgba(60, 60, 60, 0.5) !important diff --git a/pages/frontpage/frontpage.go b/pages/frontpage/frontpage.go index 94feb8fc..81cbf7d0 100644 --- a/pages/frontpage/frontpage.go +++ b/pages/frontpage/frontpage.go @@ -2,10 +2,27 @@ package frontpage import ( "github.com/aerogo/aero" + "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" ) // Get ... func Get(ctx *aero.Context) string { + description := "Anime list and notifier for new anime episodes. Create your own anime list and keep track of your progress as you watch." + + ctx.Data = &arn.OpenGraph{ + Tags: map[string]string{ + "og:title": ctx.App.Config.Title, + "og:description": description, + "og:type": "website", + "og:url": "https://" + ctx.App.Config.Domain, + "og:image": "https://" + ctx.App.Config.Domain + "/images/brand/600", + }, + Meta: map[string]string{ + "description": description, + "keywords": "anime,list,tracker,notifier", + }, + } + return ctx.HTML(components.FrontPage()) } diff --git a/pages/frontpage/frontpage.pixy b/pages/frontpage/frontpage.pixy index 9def8454..7e97c625 100644 --- a/pages/frontpage/frontpage.pixy +++ b/pages/frontpage/frontpage.pixy @@ -1,8 +1,8 @@ component FrontPage .frontpage.mountable - h2 notify.moe + h1 notify.moe - p Your home for everything about anime. + h2 Your home for everything about anime. //- img.action.screenshot(src="/images/elements/extension-screenshot.png", alt="Screenshot of the browser extension", title="Click to install the Chrome Extension", data-action="installExtension", data-trigger="click") diff --git a/pages/frontpage/frontpage.scarlet b/pages/frontpage/frontpage.scarlet index 5678d78c..f13e5a70 100644 --- a/pages/frontpage/frontpage.scarlet +++ b/pages/frontpage/frontpage.scarlet @@ -6,19 +6,21 @@ left 50% transform translateX(-50%) translateY(-50%) - a, h2, p + a, h1, h2 color white !important text-shadow 0px 0px 4px rgb(0, 0, 0, 0.75) - h2 + h1 font-size 2.5rem font-weight normal letter-spacing 5px text-transform uppercase line-height 1.2em - p + h2 font-size 2rem + font-weight normal + margin-top 0 margin-bottom 1em line-height 1.2em text-align center diff --git a/styles/content.scarlet b/styles/content.scarlet index 2062384e..47665a25 100644 --- a/styles/content.scarlet +++ b/styles/content.scarlet @@ -2,4 +2,4 @@ vertical padding content-padding padding-top content-padding-top - line-height 1.7em \ No newline at end of file + line-height content-line-height \ No newline at end of file diff --git a/styles/forum.scarlet b/styles/forum.scarlet index 4107476e..c0644eba 100644 --- a/styles/forum.scarlet +++ b/styles/forum.scarlet @@ -26,16 +26,21 @@ post-content-padding-y = 0.75rem h1 font-size 1.5rem line-height 1.5em + text-align left + margin typography-margin 0 h2 font-size 1.3rem line-height 1.5em font-weight normal + text-align left + margin typography-margin 0 h3 font-size 1.1rem line-height 1.5em font-weight normal + text-align left :hover .post-toolbar diff --git a/styles/headers.scarlet b/styles/headers.scarlet index e16bfae9..5842d2cf 100644 --- a/styles/headers.scarlet +++ b/styles/headers.scarlet @@ -1,7 +1,4 @@ -h1 - font-size 3em - -h2 +h1, h2 font-size 2em font-weight bold text-align center @@ -13,7 +10,7 @@ h3 text-align left margin-top 0.6em -h2, h3 +h1, h2, h3 a color text-color diff --git a/styles/include/config.scarlet b/styles/include/config.scarlet index 9621f35a..7ee83f3e 100644 --- a/styles/include/config.scarlet +++ b/styles/include/config.scarlet @@ -59,8 +59,10 @@ outline-shadow-heavy = 0 0 6px rgba(0, 0, 0, 0.6) // Distances content-padding = 1.6rem content-padding-top = 1.6rem +content-line-height = 1.7em hover-line-size = 3px nav-height = 3.11rem +typography-margin = 0.4rem // Timings fade-speed = 200ms diff --git a/styles/typography.scarlet b/styles/typography.scarlet index 19ee435a..044737a4 100644 --- a/styles/typography.scarlet +++ b/styles/typography.scarlet @@ -1,5 +1,5 @@ p, h1, h2, h3, h4, h5, h6 - margin 0.4rem 0 + margin typography-margin 0 :first-child margin-top 0 @@ -7,7 +7,7 @@ p, h1, h2, h3, h4, h5, h6 :last-child margin-bottom 0 -h2 +h1, h2 margin-top content-padding margin-bottom content-padding