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

Frontend: App Branding! #1592

Merged
merged 23 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4c771b4
Adds Browsertrix logo to nav bar
Shrinks99 Mar 12, 2024
df495e5
Update app primary color
Shrinks99 Mar 12, 2024
c3f32e5
Changes cancel crawl dialog to use danger button for action
Shrinks99 Mar 12, 2024
834a0e9
Remove browsertrix-lockup-color.svg doctype
Shrinks99 Mar 17, 2024
6af8ca5
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Mar 24, 2024
0bdcfa5
Fixes favicon path
Shrinks99 Mar 24, 2024
c3c754b
Replaces replay icon with replaywebpage icon
Shrinks99 Mar 25, 2024
ecf0249
Update main logotype
Shrinks99 Mar 25, 2024
0c14248
Re-adds Browsertrix H1 to readme
Shrinks99 Mar 25, 2024
1c919b8
Replaces H1 by putting the image inside the H1
Shrinks99 Mar 25, 2024
419552f
Remove "logo" from alt text
Shrinks99 Mar 26, 2024
05c92d5
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Mar 28, 2024
d192e55
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Mar 29, 2024
3cee7fd
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Apr 9, 2024
750c2fb
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Apr 17, 2024
02942c9
Update replay tab icon in QA review
Shrinks99 Apr 17, 2024
7cb1b37
Merge branch 'main' into frontend-browsertrix-branding
Shrinks99 Apr 18, 2024
f970949
Fixes brand lockup centering
Shrinks99 Apr 18, 2024
416a406
Class cleanup and redundant div removal
Shrinks99 Apr 18, 2024
ba7e1b8
Full width app bar and main nav (#1693)
SuaYoo Apr 18, 2024
05771d1
Fills microscope icon
Shrinks99 Apr 18, 2024
5eeec67
Delete btrix-cloud.svg
Shrinks99 Apr 18, 2024
bfe67c2
Center dynamic logo
Shrinks99 Apr 18, 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
12 changes: 12 additions & 0 deletions frontend/src/assets/brand/browsertrix-lockup-color.svg
emma-sg marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/components/ui/config-details.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export class ConfigDetails extends LiteElement {
(seed: Seed) => html`
<li>
<a
class="text-primary hover:text-indigo-400"
class="text-blue-600 hover:text-blue-500 hover:underline"
href="${seed.url}"
target="_blank"
rel="noreferrer"
Expand Down Expand Up @@ -361,7 +361,7 @@ export class ConfigDetails extends LiteElement {
${this.renderSetting(
msg("Primary Seed URL"),
html`<a
class="text-primary hover:text-indigo-400"
class="text-blue-600 hover:text-blue-500 hover:underline"
href="${primarySeedUrl!}"
target="_blank"
rel="noreferrer"
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/ui/navigation/navigation-button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export class Button extends TailwindElement {
right: "justify-end",
}[this.align],
this.active
? tw`bg-blue-100 text-blue-600 shadow-sm shadow-blue-900/20 hover:bg-blue-100`
: tw`text-neutral-600 hover:bg-blue-50`,
? tw`bg-primary-100 text-primary-800 shadow-sm shadow-primary-900/20 hover:bg-primary-100`
: tw`text-neutral-600 hover:bg-primary-50`,
]
.filter(Boolean)
.join(" ")}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/ui/tab-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class Tab extends TailwindElement {
render() {
return html`
<li
class="cursor-pointer px-3 py-4 font-semibold leading-tight text-neutral-500 transition-colors duration-fast aria-disabled:cursor-default aria-selected:text-blue-600"
class="cursor-pointer px-3 py-4 font-semibold leading-tight text-neutral-500 transition-colors duration-fast aria-disabled:cursor-default aria-selected:text-primary-600"
role="tab"
aria-selected=${this.active}
aria-controls=${ifDefined(this.name)}
Expand Down Expand Up @@ -164,7 +164,7 @@ export class TabList extends LitElement {
position: absolute;
width: var(--track-width);
border-radius: var(--track-width);
background-color: var(--sl-color-blue-500);
background-color: var(--sl-color-primary-600);
}

@media only screen and (min-width: ${TWO_COL_SCREEN_MIN_CSS}) {
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import appState, { AppStateService, use } from "./utils/state";
import type { NavigateEventDetail } from "@/controllers/navigate";
import type { NotifyEventDetail } from "@/controllers/notify";
import { theme } from "@/theme";
import brandLockupColor from "~assets/brand/browsertrix-lockup-color.svg";

import "./shoelace";
import "./components";
Expand Down Expand Up @@ -261,6 +262,7 @@ export class App extends LiteElement {
>
<div>
<a
aria-label="home"
class="text-sm font-medium hover:text-neutral-400"
href=${homeHref}
@click=${(e: MouseEvent) => {
Expand All @@ -270,7 +272,7 @@ export class App extends LiteElement {
this.navLink(e);
}}
>
${msg("Browsertrix")}
<img class="h-6" alt="Browsertrix logo" src=${brandLockupColor} />
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/org/archived-item-detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ ${this.crawl?.description}
class="h-4 shrink-0 pr-2 text-neutral-600"
></sl-icon>
<a
class="mr-2 truncate text-primary hover:underline"
class="mr-2 truncate text-blue-600 hover:text-blue-500 hover:underline"
href=${file.path}
download
title=${file.name}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/org/workflow-detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ export class WorkflowDetail extends LiteElement {
>
<sl-button
size="small"
variant="primary"
variant="danger"
?loading=${this.isCancelingOrStoppingCrawl}
@click=${async () => {
await this.cancel();
Expand Down
24 changes: 11 additions & 13 deletions frontend/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
const Color = require("color");
const { tailwindTransform } = require("postcss-lit");

const PRIMARY_COLOR = "#4876ff";
const primaryColor = Color(PRIMARY_COLOR);
const PRIMARY_COLOR = "#0891B2";

const primary = {
DEFAULT: PRIMARY_COLOR,
50: primaryColor.lighten(0.54).hex(),
100: primaryColor.lighten(0.5).hex(),
200: primaryColor.lighten(0.4).hex(),
300: primaryColor.lighten(0.3).hex(),
400: primaryColor.lighten(0.2).hex(),
500: primaryColor.lighten(0.1).hex(),
50: "#EBFAFE",
100: "#D8F6FD",
200: "#ACEBFB",
300: "#74DBF5",
400: "#3FC6E8",
500: "#0AAED7",
600: PRIMARY_COLOR,
700: primaryColor.darken(0.1).hex(),
800: primaryColor.darken(0.2).hex(),
900: primaryColor.darken(0.3).hex(),
950: primaryColor.darken(0.4).hex(),
700: "#0782A1",
800: "#066B84",
900: "#044B5D",
950: "#033744",
};

/**
Expand Down
Loading