diff --git a/unified-design-system/README.md b/unified-design-system/README.md index c365a54..e2077bc 100644 --- a/unified-design-system/README.md +++ b/unified-design-system/README.md @@ -171,4 +171,4 @@ satisfies them — Flutter, web and Python/Tkinter — is in - Don't touch `../gatelock` without the production-path verification above; a broken import there takes down 3 services at once. -`logo/` holds the six personal-logo candidates (A-F) and `contact-sheet.png`; regenerate the sheet with `python3 scripts/make_logo_sheet.py` and check one SVG with `python3 scripts/logo_check.py `. +`logo/` holds the personal-logo candidates, three variants of each of A-F (`a1`..`f3`; A is the stepped "K U / H Y" grid), and `contact-sheet.png`; regenerate the sheet with `python3 scripts/make_logo_sheet.py` and check one SVG with `python3 scripts/logo_check.py `. diff --git a/unified-design-system/logo/a1-grid-kuhy-step.svg b/unified-design-system/logo/a1-grid-kuhy-step.svg new file mode 100644 index 0000000..eee62de --- /dev/null +++ b/unified-design-system/logo/a1-grid-kuhy-step.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/unified-design-system/logo/a2-grid-kuhy-brick.svg b/unified-design-system/logo/a2-grid-kuhy-brick.svg new file mode 100644 index 0000000..ddcd347 --- /dev/null +++ b/unified-design-system/logo/a2-grid-kuhy-brick.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/unified-design-system/logo/a3-grid-kuhy-square.svg b/unified-design-system/logo/a3-grid-kuhy-square.svg new file mode 100644 index 0000000..5a57a28 --- /dev/null +++ b/unified-design-system/logo/a3-grid-kuhy-square.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/unified-design-system/logo/b-k.svg b/unified-design-system/logo/b1-k.svg similarity index 100% rename from unified-design-system/logo/b-k.svg rename to unified-design-system/logo/b1-k.svg diff --git a/unified-design-system/logo/a-grid-kuhy.svg b/unified-design-system/logo/b2-k-framed.svg similarity index 55% rename from unified-design-system/logo/a-grid-kuhy.svg rename to unified-design-system/logo/b2-k-framed.svg index a18af66..45b38b7 100644 --- a/unified-design-system/logo/a-grid-kuhy.svg +++ b/unified-design-system/logo/b2-k-framed.svg @@ -1,9 +1,7 @@ - - - - + + diff --git a/unified-design-system/logo/b3-k-leg.svg b/unified-design-system/logo/b3-k-leg.svg new file mode 100644 index 0000000..fb6a53d --- /dev/null +++ b/unified-design-system/logo/b3-k-leg.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/unified-design-system/logo/c-kuhy-wordmark.svg b/unified-design-system/logo/c1-kuhy-wordmark.svg similarity index 100% rename from unified-design-system/logo/c-kuhy-wordmark.svg rename to unified-design-system/logo/c1-kuhy-wordmark.svg diff --git a/unified-design-system/logo/c2-kuhy-shared.svg b/unified-design-system/logo/c2-kuhy-shared.svg new file mode 100644 index 0000000..b6d5c75 --- /dev/null +++ b/unified-design-system/logo/c2-kuhy-shared.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/unified-design-system/logo/c3-kuhy-square.svg b/unified-design-system/logo/c3-kuhy-square.svg new file mode 100644 index 0000000..4fcf39b --- /dev/null +++ b/unified-design-system/logo/c3-kuhy-square.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/unified-design-system/logo/contact-sheet.png b/unified-design-system/logo/contact-sheet.png index 69ddff1..8e3bd29 100644 Binary files a/unified-design-system/logo/contact-sheet.png and b/unified-design-system/logo/contact-sheet.png differ diff --git a/unified-design-system/logo/d-ky-ligature.svg b/unified-design-system/logo/d1-ky-ligature.svg similarity index 100% rename from unified-design-system/logo/d-ky-ligature.svg rename to unified-design-system/logo/d1-ky-ligature.svg diff --git a/unified-design-system/logo/d2-ky-peak.svg b/unified-design-system/logo/d2-ky-peak.svg new file mode 100644 index 0000000..1ede577 --- /dev/null +++ b/unified-design-system/logo/d2-ky-peak.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/logo/d3-ky-shared-diagonal.svg b/unified-design-system/logo/d3-ky-shared-diagonal.svg new file mode 100644 index 0000000..f04ffa5 --- /dev/null +++ b/unified-design-system/logo/d3-ky-shared-diagonal.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/logo/e-glyph.svg b/unified-design-system/logo/e1-ringed-k.svg similarity index 100% rename from unified-design-system/logo/e-glyph.svg rename to unified-design-system/logo/e1-ringed-k.svg diff --git a/unified-design-system/logo/e2-ring-chevron.svg b/unified-design-system/logo/e2-ring-chevron.svg new file mode 100644 index 0000000..2a133bd --- /dev/null +++ b/unified-design-system/logo/e2-ring-chevron.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/logo/e3-open-ring.svg b/unified-design-system/logo/e3-open-ring.svg new file mode 100644 index 0000000..e10ba69 --- /dev/null +++ b/unified-design-system/logo/e3-open-ring.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/logo/f-kr.svg b/unified-design-system/logo/f1-kr.svg similarity index 100% rename from unified-design-system/logo/f-kr.svg rename to unified-design-system/logo/f1-kr.svg diff --git a/unified-design-system/logo/f2-kr-shared-stem.svg b/unified-design-system/logo/f2-kr-shared-stem.svg new file mode 100644 index 0000000..3eb10f0 --- /dev/null +++ b/unified-design-system/logo/f2-kr-shared-stem.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/logo/f3-kr-square.svg b/unified-design-system/logo/f3-kr-square.svg new file mode 100644 index 0000000..b0e9456 --- /dev/null +++ b/unified-design-system/logo/f3-kr-square.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/unified-design-system/tests/test_make_logo_sheet.py b/unified-design-system/tests/test_make_logo_sheet.py index 2359855..4450a10 100644 --- a/unified-design-system/tests/test_make_logo_sheet.py +++ b/unified-design-system/tests/test_make_logo_sheet.py @@ -17,9 +17,9 @@ LOGO_DIR = Path(__file__).resolve().parents[1] / "logo" GOOD = (Path(__file__).parent / "fixtures" / "logo-fixture.svg").read_text() -def test_six_candidates_exist() -> None: - names = [p.name[0] for p in make_logo_sheet.candidates(LOGO_DIR)] - assert names == list("abcdef") +def test_three_variants_of_six_candidates_exist() -> None: + names = [p.name[:2] for p in make_logo_sheet.candidates(LOGO_DIR)] + assert names == [f"{kind}{n}" for kind in "abcdef" for n in "123"] @pytest.mark.parametrize("svg", sorted(LOGO_DIR.glob("*.svg")), ids=lambda p: p.name) @@ -67,7 +67,7 @@ def test_main_writes_sheet(tmp_path: Path) -> None: out = tmp_path / "sheet.png" assert make_logo_sheet.main(["--dir", str(LOGO_DIR), "--out", str(out)]) == 0 sheet = Image.open(out) - rows, cols = 6, len(make_logo_sheet.VARIANTS) * len(make_logo_sheet.SIZES) + rows, cols = 18, len(make_logo_sheet.VARIANTS) * len(make_logo_sheet.SIZES) cell, gap = make_logo_sheet.CELL, make_logo_sheet.GAP assert sheet.size == ( cols * cell + (cols + 1) * gap,