diff --git a/brand/oneorigin.lock b/brand/oneorigin.lock index 3c9f3f8..b5c4cb4 100644 --- a/brand/oneorigin.lock +++ b/brand/oneorigin.lock @@ -4,19 +4,19 @@ "repo": "https://github.com/ExtantApe/OnePhylogeny", "branch": "main", "path": "docs/oneorigin", - "commit": "35c7993d6915fb8c0622035a50f88b3e1970f4eb" + "commit": "d35a2b5949a3603dcbc7ec369aaeeb5da05809a4" }, "copy": "brand/oneorigin", "files": { - "README.md": "sha256:25b8cfbe5df31ba8b18d63138bd82a6511ed88b9c154f081369cd0f003cd8489", - "brand.md": "sha256:94556ff48b6e4c29d65d7939cd6ddd37bc568e7bddb17afe977ee2eea19a5763", - "guidelines.md": "sha256:8dfd221189b7d68fcafcb9bc2652830e537374323203fc86436d1936f97fec3f", + "README.md": "sha256:f8afbcd53fe2d32e5e85947cab9e0542e44073fe01e2fd1047ef6209276d5994", + "brand.md": "sha256:d0ae807c738efecd6235444037d73f9f1a26d9495493e597a911a022a657a6ac", + "guidelines.md": "sha256:6fb2814b66e44ed27d75f723a835c9d16772c925476fbe8da9434485284d221c", "icons/block.svg": "sha256:0ebfc31700e1e6ae1ed4c795fc83741503dcb42d73675d120ba3d6d9a0106c12", - "icons/connector.svg": "sha256:5e545f134c8514c58282df7dae6c2e97cfab37d404b3df42dc80fe8ba63b0d0d", - "icons/heart-badge.svg": "sha256:f755eda3873ad972b660f2a8999d22b65965ffc3f4375294dff0c0a065bb9415", - "icons/tile-onepedigree.svg": "sha256:13729ff38e9957e5234515278bf694eb0c1279d7f0cf85e4b62f120758f79c88", - "icons/tile-onephylogeny.svg": "sha256:61d6878f648dece5824c96959a2cb1a4a3858a001e8e0ee17284d0d460295f3d", - "icons/tile-onetaxonomy.svg": "sha256:154bd2e7ce127e6fcf7f6b1ca2ab048f60f22483a7f96608170869de022b991c", + "icons/connector.svg": "sha256:3de223d5c838932db727dd05cd7b5469ef2a41f63b1c8e1543419dc19990f85f", + "icons/heart-badge.svg": "sha256:65bad1c87b8537e6f7db0854a12ee83fb1b8be10ce9a48d103ca6503c96589db", + "icons/tile-onepedigree.svg": "sha256:3bcbed862e7ed45dd80f4c06d57395706e1ce8101d54ee1b533a3a2a03918f77", + "icons/tile-onephylogeny.svg": "sha256:2b35565c2b5fe294ff8e98b9f196b480519c8dc91b50ec218b1e5b9f51213504", + "icons/tile-onetaxonomy.svg": "sha256:c9992e5369c79332accdcac6d4757e80148eabbbaf83fe9e176096e4acc88047", "marks/onelineage-dark.svg": "sha256:fa8f1fa2b94b00c58a855feaaf57ea3e225cb6d55671dfdb30e5dcaa8169af53", "marks/onelineage-light.svg": "sha256:16dc0b05e215de1eeb5cfb2e6b8aac1fc9090327f7aa2ab6df47c879d8f05bdf", "marks/onelineage-small.svg": "sha256:9d7bd756409427a8a2e5f66cf55ea424f3554e64431bca068d2185489a796a43", @@ -32,8 +32,8 @@ "marks/onetaxonomy-dark.svg": "sha256:00a491b0b7acb3372ada4feadc9d1e574e49bd3d7b071055032479819b07e91a", "marks/onetaxonomy-light.svg": "sha256:4cd7410ff4cf6b2cc5c953310cbc05349169816f1116574b2b844c19e77cd7e7", "marks/onetaxonomy-small.svg": "sha256:ae236afd68280a82d60af711c6be344e5d4cb5c157548d13b830755c7ce6c089", - "tokens.json": "sha256:d87f3fc103e7d3e145f72dd145ae0d48dea4208957d0be20e26786b70253b3a2", - "tokens.schema.json": "sha256:337fa1a63f1fa77a6a8816ee61cf074941e02a428dd64890b2b57cff3bc7cc9b" + "tokens.json": "sha256:9b88e3c0caa75b223860b9ca57c55fb48e0d773c2d1b24abba2aee194637b6bd", + "tokens.schema.json": "sha256:e7e38666c36015eab49cb802448567137ef6e44870a335ffe34eb89ed9bea3cc" }, "outputs": {} } diff --git a/brand/oneorigin/README.md b/brand/oneorigin/README.md index ca8181e..e5d96f5 100644 --- a/brand/oneorigin/README.md +++ b/brand/oneorigin/README.md @@ -2,13 +2,13 @@ **Good tools for understanding where animals come from, without a subscription.** -OneOrigin is a suite of three independent tools from Captive Origins. Each does one job well and works on its own. Use one, two or all three, in whatever combination fits your work. +OneOrigin is a suite of three independent tools from EXTANT APE. Each does one job well and works on its own. Use one, two or all three, in whatever combination fits your work. | Tool | The question it answers | | --- | --- | -| [OnePedigree](https://github.com/CaptiveOrigins/onepedigree) | How is this individual related to its known relatives? | -| [OneTaxonomy](https://github.com/CaptiveOrigins/onetaxonomy) | What do sources claim about how life is organized, and how do we browse it? | -| [OnePhylogeny](https://github.com/CaptiveOrigins/onephylogeny) | Given DNA, what does the evidence support, and where does this sample fit? | +| [OnePedigree](https://github.com/ExtantApe/OnePedigree) | How is this individual related to its known relatives? | +| [OneTaxonomy](https://github.com/ExtantApe/OneTaxonomy) | What do sources claim about how life is organized, and how do we browse it? | +| [OnePhylogeny](https://github.com/ExtantApe/OnePhylogeny) | Given DNA, what does the evidence support, and where does this sample fit? | ## Why this exists @@ -22,10 +22,10 @@ So the OneOrigin tools are built differently. - **No account needed.** The Mac apps run on your computer. They use the internet only when you ask for public data or check for updates. - **Your files stay yours.** Everything is saved as plain, documented files you can open without us. If we vanished tomorrow, your work would still be readable. - **Your source files aren't touched.** Your extra information lives beside them. -- **The code is open to read and improve.** Anyone can read, change and share it for noncommercial use, with attribution, under [PolyForm Noncommercial](https://polyformproject.org/licenses/noncommercial/1.0.0). A business that wants to use it commercially can ask for a separate license. This license makes the code source-available, which isn't quite the same as open source. +- **The code is open to read and improve.** Anyone can read, change and share it for noncommercial use, with attribution, under [PolyForm Noncommercial](https://polyformproject.org/licenses/noncommercial/1.0.0). A business that wants to use it commercially can ask for a separate license. This license makes the code source-available. It isn't an open source license. - **Honesty over polish.** The tools say what they don't know and what a result can't tell you. Unknown stays unknown. -These commitments cover the tools. Services that have real ongoing costs, such as lab testing through Captive Origins, are separate and priced as what they are. +These commitments cover the tools. Services that have real ongoing costs, such as lab testing, are separate and priced as what they are. ## Separately or together @@ -50,4 +50,4 @@ The tools share a look, a way of behaving and a set of beliefs. Each keeps its o - **OneOrigin** is the name of the suite. It isn't a package or a product you install. - Each tool keeps its own name, repo and app. -- Packages stay under each project's scope, such as `@captiveorigins/onephylogeny-core`. +- Packages stay under each project's scope, such as `@extantape/onephylogeny-core`. diff --git a/brand/oneorigin/brand.md b/brand/oneorigin/brand.md index 8ae0d9b..32ca435 100644 --- a/brand/oneorigin/brand.md +++ b/brand/oneorigin/brand.md @@ -6,7 +6,7 @@ This is the canonical brand text. It lives in OnePhylogeny's `docs/oneorigin/`, ## Palette -The OneOrigin palette has its own colors, no longer taken from Captive Origins. Approved by the owner on 2026-11-12. The values are in `palette` in [tokens.json](tokens.json). +The OneOrigin palette has its own colors, separate from the earlier ones still used by the app icons and the interface below. Approved by the owner on 2026-11-12. The values are in `palette` in [tokens.json](tokens.json). | | OneTaxonomy | OnePhylogeny | OneLineage | OnePedigree | | --- | --- | --- | --- | --- | @@ -53,42 +53,42 @@ Five marks, each as light, dark and small SVGs in [marks/](marks/): `oneorigin`, ## App icon -The app icons, their tiles and the heart badge below are the earlier ones, drawn from Captive Origins colors. They stay as they are for now: new app icons, tiles and the maker's mark aren't decided yet. +The app icons, their tiles and the heart badge below are the earlier ones, drawn from the earlier palette. They stay as they are for now: new app icons, tiles and the maker's mark aren't decided yet. | | OnePedigree | OneTaxonomy | OnePhylogeny | | --- | --- | --- | --- | -| Tile gradient (top → bottom) | `#f8dcc0` → `#eeb684` (pastel Captive Origins orange) | `#f8d6d7` → `#eda9ac` (pastel Captive Origins pink) | `#e6d6d2` → `#c9aca5` (pastel Captive Origins mauve) | +| Tile gradient (top → bottom) | `#f8dcc0` → `#eeb684` (pastel orange) | `#f8d6d7` → `#eda9ac` (pastel pink) | `#e6d6d2` → `#c9aca5` (pastel mauve) | | Glyph | Two parents joined above one offspring | A rooted tree read left to right | A sample on a branching tree | -Both use Captive Origins brown `#4c312c` as ink (connectors, UI structure). Owner's choice 2026-11-02 (option A of the palette study; the swap, option C, stays possible: exchange the two hues). +Both use the earlier palette's brown `#4c312c` as ink (connectors, UI structure). Owner's choice 2026-11-02 (option A of the palette study; the swap, option C, stays possible: exchange the two hues). Shared by every tool: -- Tile: 896 × 896 on a 1024 canvas, corner radius 200, vertical pastel gradient of a Captive Origins color. -- Blocks: cream `#fbf8f2`, rounded (radius ≈ 36–40), connectors 34 px in Captive Origins brown with round joins (owner's choice 2026-11-11, N169: "A: round (Recommended)"; the three icons already drew them round, and the text said square). -- The Captive Origins heart badge, exactly as in the Captive Origins logo (brown ring, pink disc, white heart; paths copied from the logo), as the maker's mark, placed on "the one" (the focal individual, the selected taxon). +- Tile: 896 × 896 on a 1024 canvas, corner radius 200, vertical pastel gradient of a color from the earlier palette. +- Blocks: cream `#fbf8f2`, rounded (radius ≈ 36–40), connectors 34 px in brown `#4c312c` with round joins (owner's choice 2026-11-11, "A: round (Recommended)"; the three icons already drew them round, and the text said square). +- The heart badge (brown ring, pink disc, white heart; the paths in `icons/heart-badge.svg`), as the maker's mark, placed on "the one" (the focal individual, the selected taxon). - Small sizes (16–32 px: menu bar, file lists, favicons): `brand/icon-small.svg`, the same tile and glyph without the badge, a larger tile and heavier lines. From 64 px up, the full icon. -- Masters: `brand/icon.svg` (source) and `brand/icon-1024.png` (transparent, for app icon generators such as `tauri icon`). A future tool takes a pastel of another Captive Origins color (mauve `#91645d`, a lighter or deeper orange/pink) and its own glyph from the same blocks. +- Masters: `brand/icon.svg` (source) and `brand/icon-1024.png` (transparent, for app icon generators such as `tauri icon`). A future tool takes a pastel of another color from the earlier palette (mauve `#91645d`, a lighter or deeper orange/pink) and its own glyph from the same blocks. ### Icon parts -The shared parts, cut from the three icons without changing a value, are in [icons/](icons/): each tool's tile (`tile-onepedigree.svg`, `tile-onetaxonomy.svg`, `tile-onephylogeny.svg`), a cream block (`block.svg`), a connector (`connector.svg`) and the heart badge (`heart-badge.svg`, its paths exactly as in the logo). Each tool's glyph and the badge's place on it stay in that tool's own `brand/icon.svg`. +The shared parts, cut from the three icons without changing a value, are in [icons/](icons/): each tool's tile (`tile-onepedigree.svg`, `tile-onetaxonomy.svg`, `tile-onephylogeny.svg`), a cream block (`block.svg`), a connector (`connector.svg`) and the heart badge (`heart-badge.svg`, its paths exactly as in the icons). Each tool's glyph and the badge's place on it stay in that tool's own `brand/icon.svg`. ## Interface -The interface colors below are also the earlier ones, from Captive Origins colors, and the apps and React packages still use them. Whether they move to the palette above isn't decided yet. +The interface colors below are also the earlier ones, and the apps and React packages still use them. Whether they move to the palette above isn't decided yet. -Both React packages share these (colors from the Captive Origins palette: orange `#cf8137`, pink `#e48185`, brown `#4c312c`), under their own prefixes (`op-`, `ot-`), so neither depends on the other: +Both React packages share these (colors from the earlier palette: orange `#cf8137`, pink `#e48185`, brown `#4c312c`), under their own prefixes (`op-`, `ot-`), so neither depends on the other: -- **Icons**: the same 24 × 24 line icons in `icons.tsx`, drawn from Lucide (ISC; the set Captive Origins uses), 1.75 stroke, round caps and joins, `currentColor`. Shown next to text where a label helps; alone only in compact floating toolbars, always with `aria-label` and a visible tooltip on hover and keyboard focus (`data-tip`). Icons standing alone must say the action (a magnifier for zoom, not a bare +). Buttons are at least 32 px (WCAG asks 24); icon strokes keep 3:1 contrast; overlays use shape as well as color. +- **Icons**: the same 24 × 24 line icons in `icons.tsx`, drawn from Lucide (ISC), 1.75 stroke, round caps and joins, `currentColor`. Shown next to text where a label helps; alone only in compact floating toolbars, always with `aria-label` and a visible tooltip on hover and keyboard focus (`data-tip`). Icons standing alone must say the action (a magnifier for zoom, not a bare +). Buttons are at least 32 px (WCAG asks 24); icon strokes keep 3:1 contrast; overlays use shape as well as color. - **Controls**: 32 px buttons, radius 8, 1 px border; floating toolbar at the top right of the canvas; cards and panels radius 10 with a soft shadow; focus ring 2 px, darker orange `#a65f20` on light backgrounds and `#e7a066` in dark mode (see Focus ring below). - **Canvas**: drag the background to pan, Ctrl/⌘ + wheel or pinch to zoom, `+` `-` `0` keys, Fit, Download SVG, Print (chart only). -- **Selection**: Captive Origins orange for the selected item; the darker orange for focus in light mode; brown for structure; pink for the brand mark and highlights. +- **Selection**: the brand orange for the selected item; the darker orange for focus in light mode; brown for structure; pink for the brand mark and highlights. - Each tool keeps its own functionality and layout; only the backbone is shared. ## Focus ring -Owner's decision 2026-11-11 (N154, option A, "darker orange ring"): "keep the brand orange everywhere else, but use the darker orange #a65f20 for focus rings on light backgrounds (4.6 to 1 or better). Dark mode keeps the lighter orange, which already passes." +Owner's decision 2026-11-11 (option A, "darker orange ring"): "keep the brand orange everywhere else, but use the darker orange #a65f20 for focus rings on light backgrounds (4.6 to 1 or better). Dark mode keeps the lighter orange, which already passes." - **Light backgrounds**: focus rings are `#a65f20`. That's 4.91:1 on white and 4.61:1 or better on the cream panels (`#fbf7f4`, `#f7f8fa`, `#fdf7f7`). The brand orange was 3.07:1 on white and 2.88:1 on the panels, under the 3:1 that WCAG 2.2 asks of focus indicators (1.4.11, 2.4.13). - **Dark mode**: focus rings stay `#e7a066`, 7.1:1 or better on every dark background the tools use. diff --git a/brand/oneorigin/guidelines.md b/brand/oneorigin/guidelines.md index 12523a5..667017e 100644 --- a/brand/oneorigin/guidelines.md +++ b/brand/oneorigin/guidelines.md @@ -1,6 +1,6 @@ # OneOrigin suite guidelines -**Status: accepted by the owner on 2026-11-11 (N105: "A: send it, accept guidelines (Recommended)").** Drafted 2026-11-04. These apply to OnePedigree, OneTaxonomy and OnePhylogeny, the [OneOrigin suite](README.md). The brand text that used to be hand-copied into each repo's `brand/README.md` now lives in [brand.md](brand.md), and the machine-readable values in [tokens.json](tokens.json). Each tool carries a locked copy of this folder (section 10). +**Status: accepted by the owner on 2026-11-11 ("A: send it, accept guidelines (Recommended)").** Drafted 2026-11-04. These apply to OnePedigree, OneTaxonomy and OnePhylogeny, the [OneOrigin suite](README.md). The brand text that used to be hand-copied into each repo's `brand/README.md` now lives in [brand.md](brand.md), and the machine-readable values in [tokens.json](tokens.json). Each tool carries a locked copy of this folder (section 10). They exist so the three tools feel like one suite and keep working together as they change, while each stays its own and none depends on another. @@ -39,12 +39,12 @@ The app icons and the interface colors below are the earlier ones. They stay unt Shared by every tool: -- **Tile:** 896 × 896 on a 1024 canvas, corner radius 200, a vertical pastel gradient of a Captive Origins color. -- **Blocks and connectors:** cream `#fbf8f2` blocks with radius about 36 to 40, and 34 px Captive Origins brown `#4c312c` connectors with round joins (owner decision N169, 2026-11-11). Draw a connector's corners as one path, so the join applies; separate strokes that meet at a corner leave a notch. -- **Badge:** the Captive Origins heart badge, exactly as in the logo, as the maker's mark, placed on "the one": the focal individual, selected taxon or tested sample. +- **Tile:** 896 × 896 on a 1024 canvas, corner radius 200, a vertical pastel gradient of a color from the earlier palette. +- **Blocks and connectors:** cream `#fbf8f2` blocks with radius about 36 to 40, and 34 px brown `#4c312c` connectors with round joins (owner decision, 2026-11-11). Draw a connector's corners as one path, so the join applies; separate strokes that meet at a corner leave a notch. +- **Badge:** the heart badge, exactly as in `icons/heart-badge.svg`, as the maker's mark, placed on "the one": the focal individual, selected taxon or tested sample. - **Small sizes:** `brand/icon-small.svg` for 16 to 32 px, with the same tile and glyph, no badge, a larger tile and heavier lines. The full icon is used from 64 px up. - **Masters:** every repo must have `brand/icon.svg`, `brand/icon-small.svg` and `brand/icon-1024.png` (transparent, for `tauri icon`). -- **A future tool** takes a pastel of another Captive Origins color and its own glyph from the same blocks. +- **A future tool** takes a pastel of another color from the earlier palette and its own glyph from the same blocks. ### Color @@ -76,7 +76,7 @@ The system font stack in every tool, with monospace only for sequences, logs and - Buttons are 32 px, radius 8, with a 1 px border. - Cards and panels have radius 10 and a soft shadow. -- The focus ring is 2 px: the darker orange `#a65f20` on light backgrounds and `#e7a066` in dark mode. The brand orange `#cf8137` stays for fills, accents and selection. Owner's decision 2026-11-11 (N154, "A: darker orange ring"). +- The focus ring is 2 px: the darker orange `#a65f20` on light backgrounds and `#e7a066` in dark mode. The brand orange `#cf8137` stays for fills, accents and selection. Owner's decision 2026-11-11 ("A: darker orange ring"). - Interactive canvases have a floating toolbar at the top right. Drag the background to pan, use Ctrl/⌘ + wheel or pinch to zoom, use `+` `-` `0` keys, and offer Fit, Download SVG and Print (chart only). ### Voice @@ -155,7 +155,7 @@ fixtures/ small, illustrative, with a README - pnpm workspaces, Node 22 or later, ESM only, built with tsup and tested with Vitest. - Strict TypeScript, with `noUncheckedIndexedAccess` on. -- **Package names:** `@captiveorigins/-` and `@captiveorigins/payload-plugin-`. +- **Package names:** `@extantape/-` and `@extantape/payload-plugin-`. - **Dependencies point downward:** `core` has no runtime dependencies and compiles without DOM or Node types. It must not depend on React, Payload, databases or Tauri. Exceptions need an ADR. - No empty scaffolding. Planned work lives in the roadmap. @@ -185,14 +185,14 @@ Each decision with alternatives gets an ADR. Limitations are kept current, and n - Lockstep versions across a tool's packages. - Tag `vx.y.z` runs a workflow that tests and **stages** every package through trusted publishing, with no stored token. A maintainer approves with 2FA. - A package's first version is published by hand, then `npm trust` is set up. -- `package.json` description and keywords are the source of truth, synced to GitHub with `npm run packages:sync` in Captive Origins. Release workflows refuse to stage when they differ. -- Each repo is registered in `packages-sync.mjs` and `npm-trust.sh`. +- `package.json` description and keywords are the source of truth, copied to GitHub before each release. Release workflows refuse to stage when they differ. +- Each repo is registered in the shared description sync and trusted publishing scripts. ### Mac app - Tag `desktop-vx.y.z` builds a universal app and publishes a GitHub release with a DMG, plus `latest.json` once the tool has a signing key. - Each tool has **its own** updater key in `~/.tauri/.key`, stored as the repo secret `TAURI_SIGNING_PRIVATE_KEY`. Keys are never shared between tools or committed. -- App identifiers are `org.captiveorigins.`. +- App identifiers are `com.extantape.`. - Notarization is a shared goal, and when one tool adds it, the other apps follow. ## 8. Working together @@ -200,7 +200,7 @@ Each decision with alternatives gets an ADR. Limitations are kept current, and n - **Bridges:** integration lives in an optional package such as `onephylogeny-onetaxonomy`, which depends on both sides. Sister tools expose generic extension points and never depend on a bridge. - **Plain files between apps:** one tool's export is another's import. A tool that can't open a file should say which tool can. - **Payload plugins** map onto a host's collections rather than owning them, keep permission-aware endpoints, enforce rules on the server, and never hold exact sensitive locations. Compute that can't run on a host's servers runs elsewhere, and the plugin stores what was computed. -- **Captive Origins** consumes these packages from npm. Nothing here knows about Captive Origins, and nothing in a tool's core knows about a species or a site. +- **Sites** install these packages from npm like anyone else. Nothing here knows about any one site, and nothing in a tool's core knows about a species or a site. ## 9. Parity today @@ -226,7 +226,7 @@ From a review of the three repos on 2026-11-04, updated on 2026-11-07 after the | Cancel for long work | Not checked | n/a | Yes | | npm release workflow | Yes | Yes | Yes, first version published by hand | | Payload plugin | Yes | **Planned** | Yes | -| Installed in Captive Origins | Yes | **No** | **No** | +| Used by a live site | Yes | **No** | **No** | | License | PolyForm Noncommercial | PolyForm Noncommercial | PolyForm Noncommercial | | `core` compiles without Node types | Yes | Yes | Yes | @@ -234,7 +234,7 @@ From a review of the three repos on 2026-11-04, updated on 2026-11-07 after the ## 10. Keeping this true -- **One source:** this folder in OnePhylogeny (`docs/oneorigin/`) is the source of truth. Each tool carries a copy in `brand/oneorigin/`, with `brand/oneorigin.lock` recording the source commit and a checksum of every file. CI fails when a copy is edited by hand, and warns when the source has moved ahead. Copies, not a dependency, so each tool still builds alone. Accepted by the owner on 2026-11-11 (N105). +- **One source:** this folder in OnePhylogeny (`docs/oneorigin/`) is the source of truth. Each tool carries a copy in `brand/oneorigin/`, with `brand/oneorigin.lock` recording the source commit and a checksum of every file. CI fails when a copy is edited by hand, and warns when the source has moved ahead. Copies, not a dependency, so each tool still builds alone. Accepted by the owner on 2026-11-11. - **Changing it:** a pull request here says which tools it affects, and those tools get a parity row until they catch up. - **Pull request checklist:** - Does this change something the family shares? Then update this page. @@ -244,6 +244,6 @@ From a review of the three repos on 2026-11-04, updated on 2026-11-07 after the ### Open questions for the owner -1. Where should this live long term? Answered 2026-11-11 (N105): here, in `docs/oneorigin/`, copied into each tool. -2. Should shared look move into a shared package? Answered 2026-11-11 (N105): no. Copies with a lock and a drift check, so no tool depends on another. +1. Where should this live long term? Answered 2026-11-11: here, in `docs/oneorigin/`, copied into each tool. +2. Should shared look move into a shared package? Answered 2026-11-11: no. Copies with a lock and a drift check, so no tool depends on another. 3. Should OnePedigree's green accent change to the family orange? diff --git a/brand/oneorigin/icons/connector.svg b/brand/oneorigin/icons/connector.svg index 0302daa..6281758 100644 --- a/brand/oneorigin/icons/connector.svg +++ b/brand/oneorigin/icons/connector.svg @@ -1,6 +1,6 @@ OneOrigin connector - diff --git a/brand/oneorigin/icons/heart-badge.svg b/brand/oneorigin/icons/heart-badge.svg index 3e1f274..d6dd488 100644 --- a/brand/oneorigin/icons/heart-badge.svg +++ b/brand/oneorigin/icons/heart-badge.svg @@ -1,7 +1,7 @@ - Captive Origins heart badge - diff --git a/brand/oneorigin/icons/tile-onepedigree.svg b/brand/oneorigin/icons/tile-onepedigree.svg index d5b835e..ddcecf5 100644 --- a/brand/oneorigin/icons/tile-onepedigree.svg +++ b/brand/oneorigin/icons/tile-onepedigree.svg @@ -1,7 +1,7 @@ OnePedigree tile + a top-to-bottom pastel gradient of orange. Values in tokens.json (tools.onepedigree.tile, icon.tile). --> diff --git a/brand/oneorigin/icons/tile-onephylogeny.svg b/brand/oneorigin/icons/tile-onephylogeny.svg index 86885fc..1365ecd 100644 --- a/brand/oneorigin/icons/tile-onephylogeny.svg +++ b/brand/oneorigin/icons/tile-onephylogeny.svg @@ -1,7 +1,7 @@ OnePhylogeny tile + a top-to-bottom pastel gradient of mauve. Values in tokens.json (tools.onephylogeny.tile, icon.tile). --> diff --git a/brand/oneorigin/icons/tile-onetaxonomy.svg b/brand/oneorigin/icons/tile-onetaxonomy.svg index e825dae..78d05c3 100644 --- a/brand/oneorigin/icons/tile-onetaxonomy.svg +++ b/brand/oneorigin/icons/tile-onetaxonomy.svg @@ -1,7 +1,7 @@ OneTaxonomy tile + a top-to-bottom pastel gradient of pink. Values in tokens.json (tools.onetaxonomy.tile, icon.tile). --> diff --git a/brand/oneorigin/tokens.json b/brand/oneorigin/tokens.json index b4e91e9..b1df47c 100644 --- a/brand/oneorigin/tokens.json +++ b/brand/oneorigin/tokens.json @@ -5,9 +5,9 @@ "about": "Shared look of the OneOrigin tools, read by scripts/oneorigin.mjs build to write each tool's CSS variables. brand.md and guidelines.md explain the rules. Colors are per mode: light, then dark.", "color": { "accent": { "light": "#cf8137", "dark": "#e7a066", "use": "Selection, fills, primary buttons. Not focus rings." }, - "focus": { "light": "#a65f20", "dark": "#e7a066", "use": "Keyboard focus rings only. Owner's decision 2026-11-11 (N154): 4.6:1 or better on every light background." }, + "focus": { "light": "#a65f20", "dark": "#e7a066", "use": "Keyboard focus rings only. Owner's decision 2026-11-11: 4.6:1 or better on every light background." }, "brand-pink": { "light": "#e48185", "dark": "#eda9ac", "use": "The brand mark and highlights only." }, - "structure": { "light": "#4c312c", "dark": "#eda9ac", "use": "Lines and connectors: Captive Origins brown in light mode." }, + "structure": { "light": "#4c312c", "dark": "#eda9ac", "use": "Lines and connectors: brown in light mode." }, "mauve": { "light": "#91645d", "dark": "#c79a92", "use": "Secondary data marks." }, "text": { "light": "#1d2330", "dark": "#e8ecf2", "use": "Body text." }, "muted": { "light": "#5b6577", "dark": "#a3acbb", "use": "Supporting text." }, @@ -50,7 +50,7 @@ "onepedigree": { "name": "OnePedigree", "prefix": "op", - "tile": { "top": "#f8dcc0", "bottom": "#eeb684", "hue": "Captive Origins orange" }, + "tile": { "top": "#f8dcc0", "bottom": "#eeb684", "hue": "orange" }, "glyph": "Two parents joined above one offspring", "color": { "panel": { "light": "#f7f8fa", "dark": "#181c24" }, @@ -60,7 +60,7 @@ "onetaxonomy": { "name": "OneTaxonomy", "prefix": "ot", - "tile": { "top": "#f8d6d7", "bottom": "#eda9ac", "hue": "Captive Origins pink" }, + "tile": { "top": "#f8d6d7", "bottom": "#eda9ac", "hue": "pink" }, "glyph": "A rooted tree read left to right", "color": { "panel": { "light": "#fdf7f7", "dark": "#181c24" }, @@ -72,7 +72,7 @@ "onephylogeny": { "name": "OnePhylogeny", "prefix": "ophy", - "tile": { "top": "#e6d6d2", "bottom": "#c9aca5", "hue": "Captive Origins mauve" }, + "tile": { "top": "#e6d6d2", "bottom": "#c9aca5", "hue": "mauve" }, "glyph": "A sample on a branching tree", "color": { "panel": { "light": "#fbf7f4", "dark": "#181c24" }, diff --git a/brand/oneorigin/tokens.schema.json b/brand/oneorigin/tokens.schema.json index db3eb1d..e93013d 100644 --- a/brand/oneorigin/tokens.schema.json +++ b/brand/oneorigin/tokens.schema.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "https://github.com/CaptiveOrigins/onephylogeny/blob/main/docs/oneorigin/tokens.schema.json", + "$id": "https://github.com/ExtantApe/OnePhylogeny/blob/main/docs/oneorigin/tokens.schema.json", "title": "OneOrigin tokens", "description": "The shared look of the OneOrigin tools: colors per mode, the brand palette, radii, sizes, icon parts and each tool's tile.", "type": "object",