diff --git a/CHANGELOG.md b/CHANGELOG.md index 0784180..bc40c6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Five-tool OneOrigin palette, 2026-11-15 (D206, K656). The brand copy is relocked at OnePhylogeny 37453b0, which adds OneFamily as the fifth tool color and keeps every text color at 4.5:1 or better on white. Tested: the OneOrigin check and the full test suite. Not tested: the app screens by eye. + - Stability report (S8), 2026-11-15 (K408). `compareRuns` compares two grouping runs of one kit, matching branch labels by overlap so a renumbering isn't counted, and `assertStable` stops when more than 5% of the people placed in both runs change line (side and branch). Deeper levels, groups, newly placed and no longer placed are reported. Tested on made-up runs and a planted family; on real data it rated the original method's run against OneFamily's as stable (1.9%). The app doesn't call it yet, since it keeps one run per kit. - Genetic map download, 2026-11-15 (K653, owner's N124 A). A Genetic map card on the Kits screen offers the HapMap-derived GRCh37 map (about 24 MB) from the Beagle site at the University of Washington. It says where the map comes from and that no license is stated, downloads only after a yes, checks the pinned size and SHA-256, and can remove the map again. Comparisons use it when both raw files are on GRCh37; the demo always uses the approximate rule. Tested with made-up archives, and once by hand with the real archive (chromosome 1 comes out at 286 cM). The card hasn't been clicked in the built app. diff --git a/brand/oneorigin.lock b/brand/oneorigin.lock index b5c4cb4..ee27ed5 100644 --- a/brand/oneorigin.lock +++ b/brand/oneorigin.lock @@ -4,35 +4,38 @@ "repo": "https://github.com/ExtantApe/OnePhylogeny", "branch": "main", "path": "docs/oneorigin", - "commit": "d35a2b5949a3603dcbc7ec369aaeeb5da05809a4" + "commit": "37453b0a346e22b62696ebd9480d8d739ddad5dc" }, "copy": "brand/oneorigin", "files": { "README.md": "sha256:f8afbcd53fe2d32e5e85947cab9e0542e44073fe01e2fd1047ef6209276d5994", - "brand.md": "sha256:d0ae807c738efecd6235444037d73f9f1a26d9495493e597a911a022a657a6ac", - "guidelines.md": "sha256:6fb2814b66e44ed27d75f723a835c9d16772c925476fbe8da9434485284d221c", + "brand.md": "sha256:6b73115507761730880b90b673949c0f88c90956f3846aacd97307e5b99c8550", + "guidelines.md": "sha256:8c6434b852cb7881919732b067e437b6d63f53933e3a7114794324a73fc4162d", "icons/block.svg": "sha256:0ebfc31700e1e6ae1ed4c795fc83741503dcb42d73675d120ba3d6d9a0106c12", "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", - "marks/oneorigin-dark.svg": "sha256:6ba3863205c889adedee4ca7c6e8e2ebb89e56d4537295b4432555d5a3884793", - "marks/oneorigin-light.svg": "sha256:e4cb3c30312cf801185a5981a31a2e498886401b54d6cafa90be8a55e14a6e45", - "marks/oneorigin-small.svg": "sha256:3079a83899865d8cd518b553f62190fef40bba445ae45cd77999f4aa9021577a", - "marks/onepedigree-dark.svg": "sha256:bd67b505812cfbd83d6336a430ede3ea337be73bad6efa03505923726c65712c", - "marks/onepedigree-light.svg": "sha256:827f359f4864710312c66f3661c2a4ba0db27d6d6d64a707fa6d1a125016883f", - "marks/onepedigree-small.svg": "sha256:d8d28ef83825a43c5d1a11f23dc09269d5a6507f8b5492793a2371be562e6247", - "marks/onephylogeny-dark.svg": "sha256:660ac26a9beaa106476e43520be6f39918e7db9c54a31991f5d21f3994e64c1b", - "marks/onephylogeny-light.svg": "sha256:34721e221e59bdb0ea5e79baa8ec8921627e72c4c5f0f07d492c71e5b56a244d", - "marks/onephylogeny-small.svg": "sha256:85bbe784ba67ed724a21ed94eeeaac4a44096d670fe3a05f63852c906fcbffd8", - "marks/onetaxonomy-dark.svg": "sha256:00a491b0b7acb3372ada4feadc9d1e574e49bd3d7b071055032479819b07e91a", - "marks/onetaxonomy-light.svg": "sha256:4cd7410ff4cf6b2cc5c953310cbc05349169816f1116574b2b844c19e77cd7e7", - "marks/onetaxonomy-small.svg": "sha256:ae236afd68280a82d60af711c6be344e5d4cb5c157548d13b830755c7ce6c089", - "tokens.json": "sha256:9b88e3c0caa75b223860b9ca57c55fb48e0d773c2d1b24abba2aee194637b6bd", + "marks/onefamily-dark.svg": "sha256:79d8256fe5e1648d4a51036c5f8254a0984c315cfae2c75849b642c39a0731b8", + "marks/onefamily-light.svg": "sha256:e880068f6b73ebcc8654679e31a4b2a25e7d2595274fa881ddc825ff16a3415b", + "marks/onefamily-small.svg": "sha256:3a2b44ec0f96af86fcc31f4437af7aed4ff544a1b37b9485ae2c684c9cf37beb", + "marks/onelineage-dark.svg": "sha256:fd51f9696595afdb08f363aeb0fc8a49ca4df81a869af168be346b04f2d87fc4", + "marks/onelineage-light.svg": "sha256:2d4a5f77024da1cf5e2049ec9800c833d84d967d06dbb5151d2907e41d6f7b7a", + "marks/onelineage-small.svg": "sha256:ecfe42ad03ed9de69a56d015a4d23e2408b43ff1e3701d6336ec0d96bf4bfa85", + "marks/oneorigin-dark.svg": "sha256:f7717945a1412f10c34a9ef54b07de64874c2acb02fc1a48fbc05526fd3783b5", + "marks/oneorigin-light.svg": "sha256:2f6a210274f2c6fc043cf5356f59f6992b5791d414f4b9728ad38f7c2240cef9", + "marks/oneorigin-small.svg": "sha256:3402771cfa84eb00c730a9dda69c0f43836ab675ffb5aa50ec793ad3df2829ef", + "marks/onepedigree-dark.svg": "sha256:d5baf7de2cb5261b852fb176dde69e880bdc78f23d37567793967e053d0f575a", + "marks/onepedigree-light.svg": "sha256:14ed4d404bab44cb4d98a906f799dfbec59114ec1bcdcc251f75f6768f844902", + "marks/onepedigree-small.svg": "sha256:e5e913ce8b10d719b101ec7817562372b82b5584712a398cd4f5fe040a325540", + "marks/onephylogeny-dark.svg": "sha256:f70d557dde34ab337aee9e2ed31e178962fca3561d277d3829d885ee4bdf5ac5", + "marks/onephylogeny-light.svg": "sha256:09d49d062c03b121fe6b3be5209f1fb4f76ec5a182ae3931e9443c44d98042ea", + "marks/onephylogeny-small.svg": "sha256:1ada155e5176bf46ea825d74c266b47168ff3e675d3b30151fb97b5a96e75291", + "marks/onetaxonomy-dark.svg": "sha256:73489c5de2da9ccb6ef02a5d2848c869f7223ffca984cc2dda06d7ee3bb9d9ac", + "marks/onetaxonomy-light.svg": "sha256:aa660f65fb500303cbbfad63e0b9290a02f4f1931a07d5258d4b1d9db76b1bd5", + "marks/onetaxonomy-small.svg": "sha256:dca347b3de7e356fe255cf49fbf2824773d8d05777b0a995e9586bc6b8f0d0a8", + "tokens.json": "sha256:6765b35d5a2ad58d8466202a94fe1c33e06e97025b6139840f49d980de59dec0", "tokens.schema.json": "sha256:e7e38666c36015eab49cb802448567137ef6e44870a335ffe34eb89ed9bea3cc" }, "outputs": {} diff --git a/brand/oneorigin/brand.md b/brand/oneorigin/brand.md index 32ca435..f882767 100644 --- a/brand/oneorigin/brand.md +++ b/brand/oneorigin/brand.md @@ -1,19 +1,19 @@ # Brand -OneTaxonomy, OnePhylogeny, OneLineage and OnePedigree are separate tools from one maker: the [OneOrigin suite](README.md). Like a tool family, they share a backbone and keep their own character. The rules are in the [suite guidelines](guidelines.md); the values below are also in [tokens.json](tokens.json), the marks are in [marks/](marks/), and the shared icon parts are in [icons/](icons/). +OneTaxonomy, OneLineage, OnePhylogeny, OnePedigree and OneFamily are separate tools from one maker: the [OneOrigin suite](README.md). Like a tool family, they share a backbone and keep their own character. The rules are in the [suite guidelines](guidelines.md); the values below are also in [tokens.json](tokens.json), the marks are in [marks/](marks/), and the shared icon parts are in [icons/](icons/). This is the canonical brand text. It lives in OnePhylogeny's `docs/oneorigin/`, and each tool carries a locked copy in `brand/oneorigin/`. Change it in OnePhylogeny, never in a copy. ## Palette -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). +The OneOrigin palette has its own colors, separate from the earlier ones still used by the app icons and the interface below. The teal, cream and aubergine were approved by the owner on 2026-11-12. The five tool colors are option D, which the owner picked on 2026-11-15 when OneFamily made five tools (D206). The values are in `palette` in [tokens.json](tokens.json). -| | OneTaxonomy | OnePhylogeny | OneLineage | OnePedigree | -| --- | --- | --- | --- | --- | -| Base | `#fc9583` | `#44a446` | `#3fb1e4` | `#907be8` | -| Level 1 (one level away) | `#fdb5a8` | `#7cbf7e` | `#79c8ec` | `#b1a3ef` | -| Level 2 (two levels away) | `#feccc3` | `#a5d3a6` | `#a3daf2` | `#cac0f4` | -| Text, on white | `#a66256` (4.66:1) | `#388639` (4.53:1) | `#2c7ca0` (4.67:1) | `#7967c3` (4.62:1) | +| | OneTaxonomy | OneLineage | OnePhylogeny | OnePedigree | OneFamily | +| --- | --- | --- | --- | --- | --- | +| Base | `#fb81ab` | `#1ecdef` | `#58ac66` | `#898beb` | `#e5b254` | +| Level 1 (one level away) | `#fca7c4` | `#62dcf4` | `#8ac594` | `#acaef1` | `#edc987` | +| Level 2 (two levels away) | `#fdc3d7` | `#93e7f7` | `#afd7b6` | `#c6c7f5` | `#f3daad` | +| Text, on white | `#b05a78` (4.59:1) | `#137f94` (4.68:1) | `#43834e` (4.57:1) | `#6e6fbc` (4.50:1) | `#8e6e34` (4.74:1) | Shared by every tool: @@ -23,33 +23,32 @@ Shared by every tool: | Center of the one | `#fbf8f2` cream | `#fbf8f2` cream | | Lines | `#363051` aubergine, 12.36:1 on white | `#ece6f2`, 14.30:1 on `#1c1820` | -- **The tool colors form a tetradic rectangle**: two complementary pairs, coral and green, blue and violet. Teal sits apart as the shared accent. +- **The tool colors are evenly spaced**: pink, cyan, green, violet and gold sit about 72 degrees apart around the color wheel. Teal sits apart as the shared accent, darker than all five. - **The one is teal with a cream center** in every mark: the selected rank, the sample, the person, the animal, and the suite's origin. - **Levels are shades.** Level 1 is the base 30% of the way to white, level 2 is 52% of the way. Siblings share a shade, and each level away from the one is a step lighter. In OneTaxonomy the ranks below are darker, so a parent and its child never match. -- **Text uses the text color, never the base.** The bases are for fills: on white they reach only 2.15:1 (OneTaxonomy) to 3.40:1 (OnePedigree). Each text color is its base darkened in 2% steps until it reaches 4.5:1 on white. +- **Text uses the text color, never the base.** The bases are for fills: on white they reach only 1.90:1 (OneLineage) to 3.02:1 (OnePedigree). Each text color is its base darkened in 2% steps until it reaches 4.5:1 on white. - **Lines are aubergine**, a deep shade of the palette's violet, so the structure belongs to the palette. On dark backgrounds they turn pale. ### Checks These are tests on the tokens and the marks, in `scripts/oneorigin.test.mjs`, so a change that breaks one fails the build: -- **Colorblind distinctness.** Any two of the four tool colors and the one (light) are at least 15 apart (CIELAB ΔE), seen with normal vision and under protanopia, deuteranopia and tritanopia. Today: 40.6, 27.2, 16.9 and 16.9. The closest pairs are blue and violet (deuteranopia) and green and blue (tritanopia). The colorblind views use the Machado, Oliveira and Fernandes (2009) matrices at full severity. +- **Colorblind distinctness.** Any two of the five tool colors and the one (light) are at least 15 apart (CIELAB ΔE), seen with normal vision and under protanopia, deuteranopia and tritanopia. Today: 41.5, 20.9, 22.0 and 21.3. The closest pairs are pink and cyan (protanopia) and green and the one (tritanopia). The colorblind views use the Machado, Oliveira and Fernandes (2009) matrices at full severity. - **Contrast.** Every text color is 4.5:1 or better on white. The one is 4.5:1 or better on white and on its cream center, and its dark version on both dark backgrounds (`#1c1820`, and `#12151b` in the apps). Lines are 3:1 or better on their background. +- **The one on dark backgrounds.** The lighter teal `#3fb3a8` is at least 10 apart from every tool color, with each kind of vision. Today: 10.7, against green under tritanopia. The earlier palette reached only 7.0 here, which is part of why option D was picked. Still never draw the one without its cream center: the shape tells it apart too. - **The rule.** Level shades and text colors follow the rule above exactly. - **The marks.** Each mark is plain SVG, labelled, uses only palette colors for its background, and draws the one in teal with a cream center. -A limit the checks don't cover: on dark backgrounds the one's lighter teal `#3fb3a8` and OneLineage's blue are only 7.0 apart under tritanopia. The cream center tells the one apart by shape, so never draw the one without it. - ## Marks -Five marks, each as light, dark and small SVGs in [marks/](marks/): `oneorigin`, `onetaxonomy`, `onephylogeny`, `onelineage` and `onepedigree`, as `-light.svg`, `-dark.svg` and `-small.svg`. They are drawn on a 200 × 200 view box, without a background. +Six marks, each as light, dark and small SVGs in [marks/](marks/): `oneorigin`, `onetaxonomy`, `onelineage`, `onephylogeny`, `onepedigree` and `onefamily`, as `-light.svg`, `-dark.svg` and `-small.svg`. They are drawn on a 200 × 200 view box, without a background. - **Light** is for light backgrounds, and **dark** for dark ones: pale lines and the lighter teal. - **Small** is for 48 px and under. It has thicker lines and larger nodes, and OnePhylogeny drops its faint outer generation so it stays clean at icon size. It uses the light colors. - **One node size, always solid.** No faded or see-through nodes. The only exception is OnePhylogeny's faint outer generation, which shows that the tree goes on. -- **Orientation follows each field.** The suite and OneTaxonomy read top-down from one origin. OnePhylogeny is a circular tree, OneLineage a spiral around a person, and OnePedigree reads like a pedigree certificate, with the animal on the left. -- **The zoom chain.** OneTaxonomy is the widest view, then OnePhylogeny, OneLineage and OnePedigree each zoom closer in. -- **The suite mark** grows from the one at the top to all four tool colors. +- **Orientation follows each field.** The suite and OneTaxonomy read top-down from one origin. OneLineage is a tree of life that grows up from the one and fans into three main branches. OnePhylogeny is a circular tree, OneFamily a spiral around a person, and OnePedigree reads like a pedigree certificate, with the animal on the left. +- **The zoom chain.** OneTaxonomy is the widest view, then OneLineage, OnePhylogeny, OnePedigree and OneFamily each zoom closer in. Tool colors and the suite mark follow this order. +- **The suite mark** grows from the one at the top to all five tool colors. ## App icon diff --git a/brand/oneorigin/guidelines.md b/brand/oneorigin/guidelines.md index 667017e..7dec534 100644 --- a/brand/oneorigin/guidelines.md +++ b/brand/oneorigin/guidelines.md @@ -26,7 +26,7 @@ They exist so the three tools feel like one suite and keep working together as t ### Palette and marks -The OneOrigin palette and the five marks (the suite, OneTaxonomy, OnePhylogeny, OneLineage and OnePedigree) are in [brand.md](brand.md#palette), with the files in `marks/` and the values in `palette` in `tokens.json`. Approved by the owner on 2026-11-12. Use a tool's text color for text in its color, never the base. Draw the one in teal with its cream center, every time. +The OneOrigin palette and the six marks (the suite, OneTaxonomy, OneLineage, OnePhylogeny, OnePedigree and OneFamily) are in [brand.md](brand.md#palette), with the files in `marks/` and the values in `palette` in `tokens.json`. Approved by the owner on 2026-11-12. Use a tool's text color for text in its color, never the base. Draw the one in teal with its cream center, every time. The app icons and the interface colors below are the earlier ones. They stay until new ones are decided. diff --git a/brand/oneorigin/marks/onefamily-dark.svg b/brand/oneorigin/marks/onefamily-dark.svg new file mode 100644 index 0000000..6819189 --- /dev/null +++ b/brand/oneorigin/marks/onefamily-dark.svg @@ -0,0 +1 @@ +OneFamily mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onefamily-light.svg b/brand/oneorigin/marks/onefamily-light.svg new file mode 100644 index 0000000..36a2c1e --- /dev/null +++ b/brand/oneorigin/marks/onefamily-light.svg @@ -0,0 +1 @@ +OneFamily mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onefamily-small.svg b/brand/oneorigin/marks/onefamily-small.svg new file mode 100644 index 0000000..fb86719 --- /dev/null +++ b/brand/oneorigin/marks/onefamily-small.svg @@ -0,0 +1 @@ +OneFamily mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onelineage-dark.svg b/brand/oneorigin/marks/onelineage-dark.svg index f93ebd6..50f99ef 100644 --- a/brand/oneorigin/marks/onelineage-dark.svg +++ b/brand/oneorigin/marks/onelineage-dark.svg @@ -1 +1 @@ -OneLineage mark \ No newline at end of file +OneLineage mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onelineage-light.svg b/brand/oneorigin/marks/onelineage-light.svg index 7a6a393..3f33475 100644 --- a/brand/oneorigin/marks/onelineage-light.svg +++ b/brand/oneorigin/marks/onelineage-light.svg @@ -1 +1 @@ -OneLineage mark \ No newline at end of file +OneLineage mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onelineage-small.svg b/brand/oneorigin/marks/onelineage-small.svg index 6aff148..bb9fb52 100644 --- a/brand/oneorigin/marks/onelineage-small.svg +++ b/brand/oneorigin/marks/onelineage-small.svg @@ -1 +1 @@ -OneLineage mark \ No newline at end of file +OneLineage mark \ No newline at end of file diff --git a/brand/oneorigin/marks/oneorigin-dark.svg b/brand/oneorigin/marks/oneorigin-dark.svg index 9f62428..bcd3fd2 100644 --- a/brand/oneorigin/marks/oneorigin-dark.svg +++ b/brand/oneorigin/marks/oneorigin-dark.svg @@ -1 +1 @@ -OneOrigin mark \ No newline at end of file +OneOrigin mark \ No newline at end of file diff --git a/brand/oneorigin/marks/oneorigin-light.svg b/brand/oneorigin/marks/oneorigin-light.svg index 076941d..b2690d1 100644 --- a/brand/oneorigin/marks/oneorigin-light.svg +++ b/brand/oneorigin/marks/oneorigin-light.svg @@ -1 +1 @@ -OneOrigin mark \ No newline at end of file +OneOrigin mark \ No newline at end of file diff --git a/brand/oneorigin/marks/oneorigin-small.svg b/brand/oneorigin/marks/oneorigin-small.svg index 59bc2a5..5a0310a 100644 --- a/brand/oneorigin/marks/oneorigin-small.svg +++ b/brand/oneorigin/marks/oneorigin-small.svg @@ -1 +1 @@ -OneOrigin mark \ No newline at end of file +OneOrigin mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onepedigree-dark.svg b/brand/oneorigin/marks/onepedigree-dark.svg index 949204f..f531443 100644 --- a/brand/oneorigin/marks/onepedigree-dark.svg +++ b/brand/oneorigin/marks/onepedigree-dark.svg @@ -1 +1 @@ -OnePedigree mark \ No newline at end of file +OnePedigree mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onepedigree-light.svg b/brand/oneorigin/marks/onepedigree-light.svg index 7be2c26..2d0f4e7 100644 --- a/brand/oneorigin/marks/onepedigree-light.svg +++ b/brand/oneorigin/marks/onepedigree-light.svg @@ -1 +1 @@ -OnePedigree mark \ No newline at end of file +OnePedigree mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onepedigree-small.svg b/brand/oneorigin/marks/onepedigree-small.svg index 77ae75d..6665942 100644 --- a/brand/oneorigin/marks/onepedigree-small.svg +++ b/brand/oneorigin/marks/onepedigree-small.svg @@ -1 +1 @@ -OnePedigree mark \ No newline at end of file +OnePedigree mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onephylogeny-dark.svg b/brand/oneorigin/marks/onephylogeny-dark.svg index 35ace2d..5d2ef1e 100644 --- a/brand/oneorigin/marks/onephylogeny-dark.svg +++ b/brand/oneorigin/marks/onephylogeny-dark.svg @@ -1 +1 @@ -OnePhylogeny mark \ No newline at end of file +OnePhylogeny mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onephylogeny-light.svg b/brand/oneorigin/marks/onephylogeny-light.svg index ef396ce..64d93cf 100644 --- a/brand/oneorigin/marks/onephylogeny-light.svg +++ b/brand/oneorigin/marks/onephylogeny-light.svg @@ -1 +1 @@ -OnePhylogeny mark \ No newline at end of file +OnePhylogeny mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onephylogeny-small.svg b/brand/oneorigin/marks/onephylogeny-small.svg index 41d7eb2..b6f967a 100644 --- a/brand/oneorigin/marks/onephylogeny-small.svg +++ b/brand/oneorigin/marks/onephylogeny-small.svg @@ -1 +1 @@ -OnePhylogeny mark \ No newline at end of file +OnePhylogeny mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onetaxonomy-dark.svg b/brand/oneorigin/marks/onetaxonomy-dark.svg index be84f29..c3b9e0b 100644 --- a/brand/oneorigin/marks/onetaxonomy-dark.svg +++ b/brand/oneorigin/marks/onetaxonomy-dark.svg @@ -1 +1 @@ -OneTaxonomy mark \ No newline at end of file +OneTaxonomy mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onetaxonomy-light.svg b/brand/oneorigin/marks/onetaxonomy-light.svg index 5a6ff78..92607ab 100644 --- a/brand/oneorigin/marks/onetaxonomy-light.svg +++ b/brand/oneorigin/marks/onetaxonomy-light.svg @@ -1 +1 @@ -OneTaxonomy mark \ No newline at end of file +OneTaxonomy mark \ No newline at end of file diff --git a/brand/oneorigin/marks/onetaxonomy-small.svg b/brand/oneorigin/marks/onetaxonomy-small.svg index 91033f5..c8729dc 100644 --- a/brand/oneorigin/marks/onetaxonomy-small.svg +++ b/brand/oneorigin/marks/onetaxonomy-small.svg @@ -1 +1 @@ -OneTaxonomy mark \ No newline at end of file +OneTaxonomy mark \ No newline at end of file diff --git a/brand/oneorigin/tokens.json b/brand/oneorigin/tokens.json index b1df47c..6854b27 100644 --- a/brand/oneorigin/tokens.json +++ b/brand/oneorigin/tokens.json @@ -14,12 +14,13 @@ "background": { "light": "#ffffff", "dark": "#12151b", "use": "The page, in every Mac app." } }, "palette": { - "about": "The OneOrigin palette, approved by the owner 2026-11-12: four tool colors that form a tetradic rectangle, a shared teal for the one, a cream center and aubergine lines. The marks in marks/ use only these colors. brand.md explains the rules, and scripts/oneorigin.test.mjs checks the colorblind and contrast numbers.", + "about": "The OneOrigin palette for five tools, option D, picked by the owner 2026-11-15 (D206): five tool colors evenly spaced around the wheel, a shared teal for the one, a cream center and aubergine lines, the last three as approved 2026-11-12. The marks in marks/ use only these colors. brand.md explains the rules, and scripts/oneorigin.test.mjs checks the colorblind and contrast numbers.", "tools": { - "onetaxonomy": { "base": "#fc9583", "level1": "#fdb5a8", "level2": "#feccc3", "text": "#a66256" }, - "onephylogeny": { "base": "#44a446", "level1": "#7cbf7e", "level2": "#a5d3a6", "text": "#388639" }, - "onelineage": { "base": "#3fb1e4", "level1": "#79c8ec", "level2": "#a3daf2", "text": "#2c7ca0" }, - "onepedigree": { "base": "#907be8", "level1": "#b1a3ef", "level2": "#cac0f4", "text": "#7967c3" } + "onetaxonomy": { "base": "#fb81ab", "level1": "#fca7c4", "level2": "#fdc3d7", "text": "#b05a78" }, + "onelineage": { "base": "#1ecdef", "level1": "#62dcf4", "level2": "#93e7f7", "text": "#137f94" }, + "onephylogeny": { "base": "#58ac66", "level1": "#8ac594", "level2": "#afd7b6", "text": "#43834e" }, + "onepedigree": { "base": "#898beb", "level1": "#acaef1", "level2": "#c6c7f5", "text": "#6e6fbc" }, + "onefamily": { "base": "#e5b254", "level1": "#edc987", "level2": "#f3daad", "text": "#8e6e34" } }, "the-one": { "light": "#1f6f6b", "dark": "#3fb3a8", "use": "The one: the selected rank, the sample, the person, the animal, the suite's origin. Always with a cream center." }, "center": "#fbf8f2",