diff --git a/BRANCHING.md b/BRANCHING.md new file mode 100644 index 0000000..793d891 --- /dev/null +++ b/BRANCHING.md @@ -0,0 +1,19 @@ +# Branching workflow + +## Versioning procedure + +When starting a new period of work (a few days to a few weeks): + +1. Create **one** new branch off `main`, named `suedeN` — a plain incrementing number, no other suffix (`suede11`, `suede12`, `suede13`, ...). Continue the count from the last number used; don't restart at 1. +2. Do **all** work for that period on this same branch. Don't create a new branch per task or per fix within the period. +3. Open PRs from that branch **against `deploy`** — always `deploy`, never `main`. +4. Once the period's work is finished and merged into `deploy`, **delete the `suedeN` branch** (local and remote). + +## Merge responsibilities + +- PRs get merged into `deploy` by whoever is doing the work. +- Promoting `deploy` → `main` is Sam's job. Not the assistant's, not the branch author's — don't open a PR targeting `main`. + +## Notes + +- If a PR's branch has already been merged, pushing more commits to it does nothing useful — GitHub won't reopen a merged PR, and the push can silently recreate a disconnected branch (watch for `git push` reporting `[new branch]` for a name that should already exist). Branch fresh off current `deploy`, reapply the change, push, open a new PR. diff --git a/public/assets/logos/ai/ai-mark-dark.svg b/public/assets/logos/ai/ai-mark-dark.svg deleted file mode 100644 index 80ee6e1..0000000 --- a/public/assets/logos/ai/ai-mark-dark.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/public/assets/logos/ai/ai-mark-fg.svg b/public/assets/logos/ai/ai-mark-fg.svg deleted file mode 100644 index 98b600e..0000000 --- a/public/assets/logos/ai/ai-mark-fg.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/public/assets/logos/ai/ai-mark-teal.svg b/public/assets/logos/ai/ai-mark-teal.svg deleted file mode 100644 index 0f7f200..0000000 --- a/public/assets/logos/ai/ai-mark-teal.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/public/assets/logos/ai/logo-RG-AI-green.svg b/public/assets/logos/ai/logo-RG-AI-green.svg new file mode 100644 index 0000000..1758f8e --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-green.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/logo-RG-AI-lg-green.svg b/public/assets/logos/ai/logo-RG-AI-lg-green.svg new file mode 100644 index 0000000..2a61f65 --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-lg-green.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/logo-RG-AI-lg-pink.svg b/public/assets/logos/ai/logo-RG-AI-lg-pink.svg new file mode 100644 index 0000000..4099d41 --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-lg-pink.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/logo-RG-AI-mod-green.svg b/public/assets/logos/ai/logo-RG-AI-mod-green.svg new file mode 100644 index 0000000..4e0e1dd --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-mod-green.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/logo-RG-AI-mod-pink.svg b/public/assets/logos/ai/logo-RG-AI-mod-pink.svg new file mode 100644 index 0000000..677a115 --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-mod-pink.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/logo-RG-AI-pink.svg b/public/assets/logos/ai/logo-RG-AI-pink.svg new file mode 100644 index 0000000..a0b5197 --- /dev/null +++ b/public/assets/logos/ai/logo-RG-AI-pink.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/symbol-black.svg b/public/assets/logos/ai/symbol-black.svg new file mode 100644 index 0000000..5c30745 --- /dev/null +++ b/public/assets/logos/ai/symbol-black.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/symbol-green.svg b/public/assets/logos/ai/symbol-green.svg new file mode 100644 index 0000000..8f48d63 --- /dev/null +++ b/public/assets/logos/ai/symbol-green.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/symbol-pink.svg b/public/assets/logos/ai/symbol-pink.svg new file mode 100644 index 0000000..216ca59 --- /dev/null +++ b/public/assets/logos/ai/symbol-pink.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/ai/symbol-white.svg b/public/assets/logos/ai/symbol-white.svg new file mode 100644 index 0000000..dc7a04b --- /dev/null +++ b/public/assets/logos/ai/symbol-white.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/public/assets/logos/cohort/cohort-m500.svg b/public/assets/logos/cohort/cohort-m500.svg new file mode 100644 index 0000000..23eef3a --- /dev/null +++ b/public/assets/logos/cohort/cohort-m500.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/assets/logos/cohort/cohort-m800.svg b/public/assets/logos/cohort/cohort-m800.svg new file mode 100644 index 0000000..8d9aa96 --- /dev/null +++ b/public/assets/logos/cohort/cohort-m800.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/assets/logos/cohort/cohort-s100.svg b/public/assets/logos/cohort/cohort-s100.svg new file mode 100644 index 0000000..3c170e8 --- /dev/null +++ b/public/assets/logos/cohort/cohort-s100.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/assets/logos/cohort/cohort-s700.svg b/public/assets/logos/cohort/cohort-s700.svg new file mode 100644 index 0000000..c73e4ec --- /dev/null +++ b/public/assets/logos/cohort/cohort-s700.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/app/ai/page.tsx b/src/app/ai/page.tsx index 91a4ce6..08b94b7 100644 --- a/src/app/ai/page.tsx +++ b/src/app/ai/page.tsx @@ -23,10 +23,45 @@ const COLORS = [ { name: "Muted foreground", hex: "#737B8C", hsl: "220 10% 50%", textOn: "#060609" }, ]; -const LOGO_FILES = [ - { file: "ai-mark-teal.svg", label: "Teal — primary, for dark backgrounds", bg: "#0D0D12" }, - { file: "ai-mark-fg.svg", label: "Off-white — for dark backgrounds", bg: "#0D0D12" }, - { file: "ai-mark-dark.svg", label: "Near-black — for rare light contexts", bg: "#E8E6E3" }, +const SYMBOL_FILES = [ + { file: "symbol-green.svg", label: "Green — primary, for dark backgrounds", bg: "#0D0D12" }, + { file: "symbol-pink.svg", label: "Pink — accent, for dark backgrounds", bg: "#0D0D12" }, + { file: "symbol-white.svg", label: "White — for dark backgrounds", bg: "#0D0D12" }, + { file: "symbol-black.svg", label: "Black — for rare light contexts", bg: "#E8E6E3" }, +]; + +const LOCKUPS = [ + { + name: "Wordmark", + description: "Stacked display wordmark, no mark.", + width: 554, + height: 166, + files: [ + { file: "logo-RG-AI-green.svg", color: "Green" }, + { file: "logo-RG-AI-pink.svg", color: "Pink" }, + ], + }, + { + name: "Full Lockup", + description: "Wordmark with the crossed-swords mark.", + width: 584, + height: 110, + files: [ + { file: "logo-RG-AI-lg-green.svg", color: "Green" }, + { file: "logo-RG-AI-lg-pink.svg", color: "Pink" }, + ], + }, + { + name: "Modern Lockup", + description: + "Single-line sans-serif wordmark with the mark — matches this page's own typography.", + width: 788, + height: 105, + files: [ + { file: "logo-RG-AI-mod-green.svg", color: "Green" }, + { file: "logo-RG-AI-mod-pink.svg", color: "Pink" }, + ], + }, ]; export default function AiSubBrandPage() { @@ -79,12 +114,13 @@ export default function AiSubBrandPage() { Logo

- Derived from the original RaidGuild crossed-swords mark, recolored - for this sub-brand. Geometry unchanged. A lockup wordmark has not - been cut yet — the mark stands alone until then. + The RaidGuild AI crossed-swords mark, in four color variants, and + three lockup treatments pairing the mark with the wordmark.

-
- {LOGO_FILES.map((logo) => ( + +

Symbol

+
+ {SYMBOL_FILES.map((logo) => (

{logo.label}

@@ -108,16 +144,38 @@ export default function AiSubBrandPage() {
))}
-
- RaidGuild AI mark - - RAIDGUILD AI - + +

Lockups

+
+ {LOCKUPS.map((lockup) => ( +
+

{lockup.name}

+

{lockup.description}

+
+ {lockup.files.map((item) => ( +
+
+ {`${lockup.name} +
+

{item.color}

+ + Download SVG + +
+ ))} +
+
+ ))}
diff --git a/src/app/logos/page.tsx b/src/app/logos/page.tsx index 53e021b..8796282 100644 --- a/src/app/logos/page.tsx +++ b/src/app/logos/page.tsx @@ -212,6 +212,55 @@ export default function LogosPage() {
+ +
+

Cohort

+

+ A logo variant for the Cohort program, used on the + raidguild.org/join page. +

+
+

Floating

+
+
+ Raid Guild Cohort Logo - Moloch 800 +
+
+ Raid Guild Cohort Logo - Moloch 500 +
+
+ Raid Guild Cohort Logo - Scroll 100 +
+
+ Raid Guild Cohort Logo - Scroll 700 +
+
+
+
diff --git a/src/app/page.tsx b/src/app/page.tsx index 7858edf..58e1b4c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -211,14 +211,21 @@ export default function Home() {

-

+

- AI sub-brand → +

+ AI Sub-brand +

+

+ Design system for raidguild.ai, RaidGuild's AI + consulting agency +

-

+
{/* For Designers & Developers */} diff --git a/src/components/shared/Header.tsx b/src/components/shared/Header.tsx index 761e96b..e72aecc 100644 --- a/src/components/shared/Header.tsx +++ b/src/components/shared/Header.tsx @@ -13,6 +13,7 @@ import { import type { RefObject } from "react"; import Image from "next/image"; import Link from "next/link"; +import { usePathname } from "next/navigation"; import { Menu, X } from "lucide-react"; import HeaderNavLinks, { type HeaderNavLink, @@ -100,6 +101,7 @@ export default function Header({ const panelId = useId(); const isDesktop = useIsDesktop(); + const pathname = usePathname(); const headerHeight = isDesktop ? DESKTOP_THIN_HEIGHT : MOBILE_HEADER_HEIGHT; @@ -170,6 +172,10 @@ export default function Header({ triggerRef, }); + if (pathname?.startsWith("/ai")) { + return null; + } + return (