Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reasonably Scoped Branding Update #299

Merged
merged 28 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e250248
Update favicons
Shrinks99 Mar 20, 2024
ee68013
Set up TsconfigPathsPlugin
Shrinks99 Mar 21, 2024
80825c6
Update logos
Shrinks99 Mar 25, 2024
ad7a0e2
Replace logo in Readme with updated dynamic logo
Shrinks99 Mar 26, 2024
82d8786
Adds new webmanifest app icons
Shrinks99 Mar 29, 2024
cf6e150
Update icon.icns
Shrinks99 Mar 30, 2024
aa2c84b
Adds Windows / Linux icon
Shrinks99 Mar 30, 2024
b85f78e
Delete existing favicon and logo
Shrinks99 Apr 6, 2024
65091bb
Copy favicons to site dir on build
Shrinks99 Apr 6, 2024
ecac6fa
Update favicon name
Shrinks99 Apr 6, 2024
7b6930f
Create replaywebpage-icon-color.svg
Shrinks99 Apr 6, 2024
63d7452
Add new icons to embed receipt
Shrinks99 Apr 6, 2024
d1628a6
Add favicons to embed receipt page
Shrinks99 Apr 6, 2024
a81b9a3
Add icon to footer of embed receipt
Shrinks99 Apr 6, 2024
71b9e30
Add replaywebpage icon to about menu item
Shrinks99 Apr 6, 2024
ad6483d
Remove redundant classes from embed logo
Shrinks99 Apr 6, 2024
1bfd453
Remove rwpLogo and appLogo
Shrinks99 Apr 6, 2024
b7a23ee
Updates main app lockup logo
Shrinks99 Apr 6, 2024
ab0d70f
Replace logo in about dialog
Shrinks99 Apr 7, 2024
6145f2a
Add new logo to loading page
Shrinks99 Apr 7, 2024
0fc73d8
Relink new logo to embed.ts
Shrinks99 Apr 7, 2024
0a7aa61
Relink new logo to google drive auth page
Shrinks99 Apr 7, 2024
0d56bd2
Update logo on service worker error page
Shrinks99 Apr 7, 2024
6d17671
Remove animated logo element
Shrinks99 Apr 7, 2024
82b19ac
Delete logo.svg
Shrinks99 Apr 7, 2024
41ad538
Merge branch 'dev-2.0.0' into well-scoped-branding-update
ikreymer Apr 8, 2024
9fe7d9f
Sets main logo image to be undraggable
Shrinks99 Apr 8, 2024
f8dd5c6
favicons: copy favicons to site/favicons
ikreymer Apr 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<p align="center"><img src="/assets/logo.svg" width="128" height="128"></p>

# ReplayWeb.page
<h1>
<div align="center">
<img alt="ReplayWebpage" src="assets/replaywebpage-lockup-color-dynamic.svg" width="90%">
</div>
</h1>

## Serverless Web Archive Replay

Expand Down
3 changes: 0 additions & 3 deletions assets/globe.svg

This file was deleted.

78 changes: 0 additions & 78 deletions assets/logo.svg

This file was deleted.

1 change: 1 addition & 0 deletions assets/replaywebpage-lockup-color-dynamic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"process": "^0.11.10",
"register-service-worker": "^1.7.2",
"split.js": "^1.6.4",
"stream-browserify": "^3.0.0"
"stream-browserify": "^3.0.0",
"tsconfig-paths-webpack-plugin": "^4.1.0"
},
"devDependencies": {
"@playwright/test": "^1.38.1",
Expand Down
3 changes: 3 additions & 0 deletions site/embed.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
background-color: lightgrey;
}
</style>
<link rel="icon" href="/favicon.ico" sizes="32x32">
<link rel="icon" href="/favicon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
</head>
<body>
<replay-web-page
Expand Down
Binary file removed site/favicon.png
Binary file not shown.
4 changes: 3 additions & 1 deletion site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<html class="no-overflow">
<head>
<link rel="manifest" href="/webmanifest.json" />
<link rel="icon" href="favicon.png" type="image/png" />
<title>ReplayWeb.page</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="./ui.js"></script>
<link rel="icon" href="/favicons/favicon.ico" sizes="32x32">
<link rel="icon" href="/favicons/favicon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="/favicons/apple-touch-icon.png">
</head>
<body>
<replay-app-main></replay-app-main>
Expand Down
78 changes: 0 additions & 78 deletions site/logo.svg

This file was deleted.

14 changes: 3 additions & 11 deletions site/webmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@
"short_name": "ReplayWeb.page",
"description": "A tool to explore and replay interactive archived web pages directly in the browser",
"icons": [
{
"src": "assets/favicon.png",
"sizes": "512x512",
"type": "image/png"
},
{
"src": "assets/logo.svg",
"sizes": "252x252",
"type": "image/svg"
}
{ "src": "/favicons/icon-192.png", "type": "image/png", "sizes": "192x192" },
{ "src": "/favicons/icon-512.png", "type": "image/png", "sizes": "512x512" }
],
"start_url": "/",
"display": "standalone",
"theme_color": "#27a0ff"
"theme_color": "#ffffff"
}
45 changes: 26 additions & 19 deletions src/appmain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js";
import {
wrapCss,
rwpLogo,
IS_APP,
VERSION,
clickOnSpacebarPress,
updateFaviconLinks,
} from "./misc";

import brandLockupColor from "~assets/brand/replaywebpage-lockup-color.svg";
import rwpLogo from "~assets/brand/replaywebpage-icon-color.svg";

import fasHelp from "@fortawesome/fontawesome-free/svgs/solid/question-circle.svg";
import fasArrowLeft from "@fortawesome/fontawesome-free/svgs/solid/arrow-left.svg";
import fasArrowRight from "@fortawesome/fontawesome-free/svgs/solid/arrow-right.svg";
Expand Down Expand Up @@ -244,14 +246,20 @@ export class ReplayWebApp extends LitElement {
}

renderNavBrand() {
return html` <span
id="home"
class="logo-text has-text-weight-bold is-size-6 has-allcaps wide-only"
>
<span class="has-text-primary">replay</span>
<span class="has-text-link">web.page</span>
<span class="is-sr-only">Home</span>
</span>`;
return html` <img
style="height: 1.25rem; user-drag: none; user-select: none; -moz-user-select: none;"
src="data:image/svg+xml,${encodeURIComponent(
brandLockupColor as string,
)}"
alt="ReplayWeb.page"
draggable="false"
/>
<span
id="home"
class="logo-text has-text-weight-bold is-size-6 has-allcaps wide-only"
>
<span class="is-sr-only">Home</span>
</span>`;
}

renderNavBar() {
Expand All @@ -261,7 +269,7 @@ export class ReplayWebApp extends LitElement {
class="skip-link"
>Skip main navigation</a
>
<nav class="navbar has-background-info" aria-label="main">
<nav class="navbar" aria-label="main">
<div class="navbar-brand">
${!this.embed
? html`
Expand All @@ -270,12 +278,6 @@ export class ReplayWebApp extends LitElement {
class="navbar-item wr-logo-item"
aria-labelledby="home"
>
<fa-icon
id="wrlogo"
size="1.0rem"
.svg=${this.mainLogo}
aria-hidden="true"
></fa-icon>
${this.renderNavBrand()}
</a>
${this.collTitle
Expand Down Expand Up @@ -398,7 +400,6 @@ export class ReplayWebApp extends LitElement {
embed="${ifDefined(this.embed === null ? undefined : this.embed)}"
appName="${this.appName}"
swName="${ifDefined(this.swName)}"
.appLogo="${this.mainLogo}"
@replay-favicons=${this.onFavIcons}
@update-title=${this.onTitle}
@coll-loaded=${this.onCollLoaded}
Expand Down Expand Up @@ -472,7 +473,7 @@ export class ReplayWebApp extends LitElement {
this.swmanager.register().catch(
() =>
// @ts-expect-error - TS2554 - Expected 2 arguments, but got 1.
(this.swErrorMsg = this.swmanager?.renderErrorReport(this.mainLogo)),
(this.swErrorMsg = this.swmanager?.renderErrorReport()),
);

window.addEventListener("popstate", () => {
Expand Down Expand Up @@ -735,7 +736,13 @@ export class ReplayWebApp extends LitElement {
<div class="content">
<div style="display: flex">
<div class="has-text-centered" style="width: 220px">
<wr-anim-logo class="logo" size="48px"></wr-anim-logo>
<img
style="height: 3rem;"
src="data:image/svg+xml,${encodeURIComponent(
rwpLogo as string,
)}"
alt="ReplayWeb.page Logo"
/>
<div style="font-size: smaller; margin-bottom: 1em">${
IS_APP ? "App" : ""
} v${VERSION}</div>
Expand Down
Loading
Loading