diff --git a/backend/static/logo.svg b/backend/static/logo.svg new file mode 100644 index 0000000..8571fba --- /dev/null +++ b/backend/static/logo.svg @@ -0,0 +1,23 @@ + + mangaBookmark + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/static/style.css b/backend/static/style.css index 7ccbda7..c1e8ce7 100644 --- a/backend/static/style.css +++ b/backend/static/style.css @@ -197,14 +197,21 @@ button { cursor: pointer; } /* ---- brand + chrome ---- */ .brand { margin: 0; + display: flex; + align-items: center; + gap: 10px; font: 400 26px/1 var(--font-display); color: var(--paper); } .brand em { color: var(--ember); font-style: italic; } +.brand .mark { width: 30px; height: 26px; flex: none; overflow: visible; } +/* The line art is drawn at a 5px stroke on a 200-unit grid; at brand size that + thins out, so it is nudged up rather than scaled down blindly. */ +.brand .mark g { stroke-width: 6.5; } .topbar { display: flex; - align-items: baseline; + align-items: center; justify-content: space-between; gap: 16px; padding: 22px 20px 14px; @@ -745,6 +752,7 @@ button { cursor: pointer; } :root { --cover-w: 80px; --row-gap: 20px; } .topbar { padding: 26px 32px 18px; } .brand { font-size: 30px; } + .brand .mark { width: 35px; height: 30px; } .chrome { flex-direction: row; diff --git a/backend/templates/app.html b/backend/templates/app.html index 8699b35..10d5342 100644 --- a/backend/templates/app.html +++ b/backend/templates/app.html @@ -6,6 +6,7 @@ mangaBookmark + {{/* Body text before meta lines: DM Sans is the biggest face and the one @@ -18,7 +19,7 @@ {{template "icons" .}}
-

mangaBookmark

+

{{template "mark" .}}mangaBookmark

diff --git a/backend/templates/chrome.html b/backend/templates/chrome.html index cc9d898..7537c9a 100644 --- a/backend/templates/chrome.html +++ b/backend/templates/chrome.html @@ -48,4 +48,31 @@
{{end}} +{{/* The brand mark, inline so it takes the page's ink and ember rather than the + fixed palette of /static/logo.svg (which the favicon needs). */}} +{{define "mark"}} + +{{end}} + {{define "newcount"}}{{.NewCount}}{{end}} diff --git a/backend/templates/login.html b/backend/templates/login.html index c6cc228..1542737 100644 --- a/backend/templates/login.html +++ b/backend/templates/login.html @@ -6,6 +6,7 @@ mangaBookmark + @@ -13,7 +14,7 @@
Private library -

mangaBookmark

+

{{template "mark" .}}mangaBookmark

diff --git a/backend/web_test.go b/backend/web_test.go index a37bd0f..44f90fa 100644 --- a/backend/web_test.go +++ b/backend/web_test.go @@ -189,7 +189,7 @@ func TestBookmarksAPIStillBearerOnly(t *testing.T) { func TestStaticAssetsServed(t *testing.T) { srv, _ := newWebTestServer(t, webConfig()) - for _, path := range []string{"/static/style.css", "/static/htmx.min.js", "/static/filter.js"} { + for _, path := range []string{"/static/style.css", "/static/htmx.min.js", "/static/filter.js", "/static/logo.svg"} { rr := httptest.NewRecorder() srv.ServeHTTP(rr, httptest.NewRequest(http.MethodGet, path, nil)) if rr.Code != http.StatusOK { diff --git a/userscript/manga-bookmark.user.js b/userscript/manga-bookmark.user.js index 1c36ebf..9392de1 100644 --- a/userscript/manga-bookmark.user.js +++ b/userscript/manga-bookmark.user.js @@ -1383,7 +1383,31 @@