From 170811ed84c5e3911ce38b9e0e1a288b5672ad61 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Sun, 8 Dec 2024 22:21:41 -0800 Subject: [PATCH] Replace logo --- .github/workflows/ci.yml | 2 +- bin/compile-static.py | 2 - css/GlobalBar.css | 15 +- css/main.css | 9 +- img/lettertype.svg | 283 --------------------------------- img/logotype.svg | 95 ----------- yarrharr/templates/header.html | 3 +- yarrharr/templates/login.html | 2 +- 8 files changed, 8 insertions(+), 403 deletions(-) delete mode 100644 img/lettertype.svg delete mode 100644 img/logotype.svg diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0c7e051..475a091c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: # that are expected to exist by the manifest.json view test. - run: | mkdir yarrharr/static - touch yarrharr/static/{icon,logotype,lettertype}-xyz.{ico,png,svg} + touch yarrharr/static/icon-xyz.{ico,png,svg} touch yarrharr/static/{normalize,main,fonts}-xyz.css touch yarrharr/static/{runtime,vendor,main}-xyz.js diff --git a/bin/compile-static.py b/bin/compile-static.py index 4d9a985d..b89d95d8 100755 --- a/bin/compile-static.py +++ b/bin/compile-static.py @@ -391,8 +391,6 @@ async def _main(build_dir: Path, out_dir: Path, compress: bool) -> None: await asyncio.gather( process_svg(icon, w), rasterize_favicon(icon, build_dir, w), - process_svg(repo_root / "img" / "lettertype.svg", w), - process_svg(repo_root / "img" / "logotype.svg", w), process_glob((repo_root / "vendor" / "normalize.css").glob("normalize-*.css"), w), process_css(repo_root / "css" / "main.css", w), process_fonts(repo_root, w), diff --git a/css/GlobalBar.css b/css/GlobalBar.css index 4a08fa30..d323a215 100644 --- a/css/GlobalBar.css +++ b/css/GlobalBar.css @@ -1,27 +1,18 @@ .yarrharr-masthead { display: flex; flex: 0 0 auto; + font: 1.5rem Montez, sans-serif; - img { - flex: 1 1 auto; - width: auto; - height: auto; - max-height: 100%; - filter: var(--logo-filter); + &:link { + text-decoration: none; } .logotype { display: block; - width: 10rem; - } - .lettertype { - display: none; - width: 3rem; } @media (max-width: 30rem) { .logotype { display: none; } - .lettertype { display: block; } } } diff --git a/css/main.css b/css/main.css index 93f68644..b38fcc0a 100644 --- a/css/main.css +++ b/css/main.css @@ -15,8 +15,6 @@ --icon-color: #666; --icon-color-off: var(--border-color); - --logo-filter: none; - --heart-color: #c92ccc; --check-color: #39cc5c; --selected-color: hsl(24.1, 100%, 49.2%); @@ -54,11 +52,6 @@ --icon-color: #eee; --icon-color-off: #666; - /* Invert the logo image so that it is legible in the dark theme. We - * don't go 100% because it is pretty bold. - */ - --logo-filter: invert(90%); - --font-weight-mono: 300; scrollbar-color: var(--quiet-text-color) var(--background-color); @@ -323,6 +316,8 @@ form.small-form { padding: 1rem 1rem 0 0; flex: 100 1 auto; + font: 3.5rem Montez, sans-serif; + text-align: center; img { diff --git a/img/lettertype.svg b/img/lettertype.svg deleted file mode 100644 index 88b647cd..00000000 --- a/img/lettertype.svg +++ /dev/null @@ -1,283 +0,0 @@ - - - - - Yarrharr icon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Yarrharr icon - - - - - - - - Tom Most - - - - - - icon - feed - rss - eyepatch - - - - - - - - - - - diff --git a/img/logotype.svg b/img/logotype.svg deleted file mode 100644 index 148a74ff..00000000 --- a/img/logotype.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/yarrharr/templates/header.html b/yarrharr/templates/header.html index 2225a5b6..31c11be4 100644 --- a/yarrharr/templates/header.html +++ b/yarrharr/templates/header.html @@ -4,8 +4,7 @@
- Yarrharr - Yarrharr + Yarrharr