amadan
Merge branch 'theme-calma' into main
Calma: this app's own accent, Onest and the new icons Adopts estilo's Calma (estilo decisions-table row 8, pinned 5b2ce83): theme.ForApp for this app, Onest via estilo's FontHandler, Calma icons. Reviewed by Claude Fable 5.1 across all seven app branches: approved.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
18 files changed,
+158
−171
Makefile+1 −1go.mod+1 −1go.sum+2 −0internal/calls/app.go+3 −0internal/calls/credits/notices.json+11 −0internal/calls/credits_inventory_test.go+2 −2internal/calls/static/brand/apple-touch-icon.pngbinaryinternal/calls/static/brand/brand.css+2 −2internal/calls/static/brand/icon-32.pngbinaryinternal/calls/static/brand/icon.svg+1 −2internal/calls/static/theme.css+70 −158internal/calls/templates/layout.html+1 −0internal/callstest/fontlink_test.go+24 −0internal/callstest/vendored_test.go+19 −5native/apple/Sources/CallsMac/Resources/AppIcon.pngbinarynative/apple/Sources/CallsMac/Resources/MacIcon.pngbinarynative/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.pngbinaryscripts/writetheme/main.go+21 −0
CI passed — run details
CI log
=== vet === go vet ./... === fmt === === test === go test ./... ok amadan.net/oficina/calls/callscore (cached) ? amadan.net/oficina/calls/cmd/calls [no test files] ok amadan.net/oficina/calls/internal/calls 1.423s ok amadan.net/oficina/calls/internal/calls/apns (cached) ok amadan.net/oficina/calls/internal/calls/hub (cached) ? amadan.net/oficina/calls/internal/calls/icons [no test files] ok amadan.net/oficina/calls/internal/calls/relay (cached) ok amadan.net/oficina/calls/internal/calls/seal (cached) ok amadan.net/oficina/calls/internal/callstest 8.459s ? amadan.net/oficina/calls/protocol [no test files] ? amadan.net/oficina/calls/scripts/writetheme [no test files] === migration-check === go run amadan.net/rastrillo/rastrillo/cmd/rastrillo migration check rastrillo migration check: models and migrations agree === race === CGO_ENABLED=1 go test -race ./internal/... ok amadan.net/oficina/calls/internal/calls 9.183s ok amadan.net/oficina/calls/internal/calls/apns (cached) ok amadan.net/oficina/calls/internal/calls/hub (cached) ? amadan.net/oficina/calls/internal/calls/icons [no test files] ok amadan.net/oficina/calls/internal/calls/relay (cached) ok amadan.net/oficina/calls/internal/calls/seal (cached) ok amadan.net/oficina/calls/internal/callstest 26.333s
diff --git a/Makefile b/Makefile| index 84c54ee..e3731d2 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -200,7 +200,7 @@ credits: |
| GOOS=$$(go env GOHOSTOS) GOARCH=$$(go env GOHOSTARCH) CGO_ENABLED=0 \ |
| go build -o "$$notices_tmp/notices" amadan.net/oficina/estilo.git/cmd/oficina-notices; \ |
| GOOS=linux GOARCH=arm64 CGO_ENABLED=0 "$$notices_tmp/notices" \ |
| - -package ./cmd/calls -lucide \ |
| + -package ./cmd/calls -lucide -onest \ |
| -exclude amadan.net/oficina/estilo.git,amadan.net/oficina/home/connect,amadan.net/oficina/home/handoff \ |
| > "$$notices_tmp/notices.json"; \ |
| mv "$$notices_tmp/notices.json" internal/calls/credits/notices.json |
diff --git a/go.mod b/go.mod| index dfd74c9..8aa2562 100644 |
| --- a/go.mod |
| +++ b/go.mod |
| @@ -3,7 +3,7 @@ module amadan.net/oficina/calls |
| go 1.26.0 |
| require ( |
| - amadan.net/oficina/estilo.git v0.0.0-20260912220956-ce2a798571db |
| + amadan.net/oficina/estilo.git v0.0.0-20260929070530-5b2ce835e773 |
| amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f |
| amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489 |
| amadan.net/rastrillo/rastrillo v0.26.1-0.20260908075707-29e4491631bd |
diff --git a/go.sum b/go.sum| index 1cf5b10..0e54e7b 100644 |
| --- a/go.sum |
| +++ b/go.sum |
| @@ -1,5 +1,7 @@ |
| amadan.net/oficina/estilo.git v0.0.0-20260912220956-ce2a798571db h1:FpEJRx+xnInTOq7MlHj/fIWbQmXgqec9t2lX8Y5ZBHk= |
| amadan.net/oficina/estilo.git v0.0.0-20260912220956-ce2a798571db/go.mod h1:0R45/vCUAT+kpS7S6K/ZxBdE8f7YxFN4HT3HyDJ3nPY= |
| +amadan.net/oficina/estilo.git v0.0.0-20260929070530-5b2ce835e773 h1:9DIAhG3TaGG+LE2+8LvU73ZEhfK+oNn2y2p4kFjAAi0= |
| +amadan.net/oficina/estilo.git v0.0.0-20260929070530-5b2ce835e773/go.mod h1:4u0jNBtIdMLOsJyrScfqoEuYDJF7BBM3qM9YWbzt6aw= |
| amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f h1:lkw3tjzHfZxe74pNfo+tGDz4mkZLg+D6R+FTkmsym6M= |
| amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f/go.mod h1:YroavXe43Wietec+po8mtSk4a9Bir2h31Q3iAf4MWxI= |
| amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489 h1:RPKtyry/71i06o8L+gjAaUyexbmG56kO1YPs601URAM= |
diff --git a/internal/calls/app.go b/internal/calls/app.go| index 32eef0b..83abe9f 100644 |
| --- a/internal/calls/app.go |
| +++ b/internal/calls/app.go |
| @@ -1,6 +1,7 @@ |
| package calls |
| import ( |
| + "amadan.net/oficina/estilo.git/theme" |
| "context" |
| "crypto/rand" |
| "encoding/hex" |
| @@ -527,6 +528,8 @@ func build(ctx context.Context, d *db.DB, cfg Config) (*http.ServeMux, *app, err |
| mux := http.NewServeMux() |
| mux.HandleFunc("GET /static/credits.css", serveCreditsCSS) |
| mux.Handle("GET /static/", assets.Handler()) |
| + // Onest, Calma's typeface, served by estilo under its versioned prefix. |
| + mux.Handle("GET "+theme.FontPrefix, theme.FontHandler()) |
| mux.Handle("/", r) |
| return mux, a, nil |
| } |
diff --git a/internal/calls/credits/notices.json b/internal/calls/credits/notices.json| index b9f59b0..2a332b9 100644 |
| --- a/internal/calls/credits/notices.json |
| +++ b/internal/calls/credits/notices.json |
| @@ -22,6 +22,17 @@ |
| } |
| ] |
| }, |
| + { |
| + "Name": "Onest", |
| + "Version": "Google Fonts v11", |
| + "SourceURL": "https://github.com/googlefonts/onest", |
| + "Notices": [ |
| + { |
| + "Name": "OFL.txt", |
| + "Text": "Copyright 2021 The Onest Project Authors (https://github.com/googlefonts/onest)\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is copied below, and is also available with a FAQ at:\nhttps://scripts.sil.org/OFL\n\n\n-----------------------------------------------------------\nSIL OPEN FONT LICENSE Version 1.1 - 26 February 2007\n-----------------------------------------------------------\n\nPREAMBLE\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded, \nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\"Font Software\" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n\"Reserved Font Name\" refers to any names specified as such after the\ncopyright statement(s).\n\n\"Original Version\" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n\"Modified Version\" refers to any derivative made by adding to, deleting,\nor substituting -- in part or in whole -- any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n\"Author\" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION \u0026 CONDITIONS\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\nTHE FONT SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE.\n" |
| + } |
| + ] |
| + }, |
| { |
| "Name": "amadan.net/rastrillo/rastrillo", |
| "Version": "v0.26.1-0.20260908075707-29e4491631bd", |
diff --git a/internal/calls/credits_inventory_test.go b/internal/calls/credits_inventory_test.go| index 458deac..ec91635 100644 |
| --- a/internal/calls/credits_inventory_test.go |
| +++ b/internal/calls/credits_inventory_test.go |
| @@ -48,7 +48,7 @@ func TestCreditsMatchProductionDependencies(t *testing.T) { |
| ctx, cancel := context.WithTimeout(t.Context(), 45*time.Second) |
| defer cancel() |
| - command := exec.CommandContext(ctx, "go", "list", "-deps", "-json", "./cmd/calls") |
| + command := exec.CommandContext(ctx, "go", "list", "-buildvcs=false", "-deps", "-json", "./cmd/calls") |
| command.Dir = filepath.Join("..", "..") |
| for _, entry := range os.Environ() { |
| if !strings.HasPrefix(entry, "GOOS=") && !strings.HasPrefix(entry, "GOARCH=") && !strings.HasPrefix(entry, "CGO_ENABLED=") && !strings.HasPrefix(entry, "GOWORK=") { |
| @@ -68,7 +68,7 @@ func TestCreditsMatchProductionDependencies(t *testing.T) { |
| if err != nil { |
| t.Fatal(err) |
| } |
| - inventory.Components = append(inventory.Components, credits.Lucide(), credits.Component{Name: "Go", Version: runtime.Version(), SourceURL: "https://go.dev/LICENSE", Notices: []credits.Notice{{Name: "LICENSE", Text: string(goLicense)}}}) |
| + inventory.Components = append(inventory.Components, credits.Lucide(), credits.Onest(), credits.Component{Name: "Go", Version: runtime.Version(), SourceURL: "https://go.dev/LICENSE", Notices: []credits.Notice{{Name: "LICENSE", Text: string(goLicense)}}}) |
| sort.Slice(inventory.Components, func(i, j int) bool { return inventory.Components[i].Name < inventory.Components[j].Name }) |
| expected, _ := json.Marshal(creditInventory{Components: inventory.Components, MissingNotices: inventory.MissingNotices}) |
| actual, _ := json.Marshal(embedded) |
diff --git a/internal/calls/static/brand/apple-touch-icon.png b/internal/calls/static/brand/apple-touch-icon.png| index 1354068..01b4826 100644 |
| Binary files a/internal/calls/static/brand/apple-touch-icon.png and b/internal/calls/static/brand/apple-touch-icon.png differ |
diff --git a/internal/calls/static/brand/brand.css b/internal/calls/static/brand/brand.css| index 2e194c6..27e25ad 100644 |
| --- a/internal/calls/static/brand/brand.css |
| +++ b/internal/calls/static/brand/brand.css |
| @@ -1,4 +1,5 @@ |
| -/* Oficina brand artwork. Source: oficina/estilo brand/. */ |
| +/* Oficina brand artwork. Source: oficina/estilo brand/. The icons carry |
| + their own squircle and transparent corners, so nothing here rounds them. */ |
| [estilo-brand] { |
| display: inline-flex; |
| align-items: center; |
| @@ -10,7 +11,6 @@ |
| flex-shrink: 0; |
| inline-size: 1.75rem; |
| block-size: 1.75rem; |
| - border-radius: 21%; |
| vertical-align: middle; |
| } |
| [estilo-brand-icon="listing"] { |
diff --git a/internal/calls/static/brand/icon-32.png b/internal/calls/static/brand/icon-32.png| index e5b0218..2fe9c8c 100644 |
| Binary files a/internal/calls/static/brand/icon-32.png and b/internal/calls/static/brand/icon-32.png differ |
diff --git a/internal/calls/static/brand/icon.svg b/internal/calls/static/brand/icon.svg| index a98731d..d3c4db4 100644 |
| --- a/internal/calls/static/brand/icon.svg |
| +++ b/internal/calls/static/brand/icon.svg |
| @@ -1,2 +1 @@ |
| -<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024" role="img" aria-label="Calls"><title>Calls</title><rect x="0" y="0" width="1024" height="1024" rx="0" fill="#087F8C"/><g transform="translate(153.6 153.6) scale(29.866666666666664)" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m16 13 5.223 3.482a.5.5 0 0 0 .777-.416V7.87a.5.5 0 0 0-.752-.432L16 10.5" /> |
| - <rect x="2" y="6" width="14" height="12" rx="2" /></g></svg> |
| +<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 100 100" role="img" aria-label="Calls"><title>Calls</title><defs><clipPath id="s"><path d="M96.00 50.00L95.97 64.13L95.90 68.64L95.77 71.90L95.60 74.54L95.37 76.79L95.09 78.76L94.75 80.51L94.37 82.10L93.92 83.54L93.43 84.86L92.87 86.07L92.26 87.19L91.59 88.22L90.85 89.17L90.05 90.05L89.17 90.85L88.22 91.59L87.19 92.26L86.07 92.87L84.86 93.43L83.54 93.92L82.10 94.37L80.51 94.75L78.76 95.09L76.79 95.37L74.54 95.60L71.90 95.77L68.64 95.90L64.13 95.97L50.00 96.00L35.87 95.97L31.36 95.90L28.10 95.77L25.46 95.60L23.21 95.37L21.24 95.09L19.49 94.75L17.90 94.37L16.46 93.92L15.14 93.43L13.93 92.87L12.81 92.26L11.78 91.59L10.83 90.85L9.95 90.05L9.15 89.17L8.41 88.22L7.74 87.19L7.13 86.07L6.57 84.86L6.08 83.54L5.63 82.10L5.25 80.51L4.91 78.76L4.63 76.79L4.40 74.54L4.23 71.90L4.10 68.64L4.03 64.13L4.00 50.00L4.03 35.87L4.10 31.36L4.23 28.10L4.40 25.46L4.63 23.21L4.91 21.24L5.25 19.49L5.63 17.90L6.08 16.46L6.57 15.14L7.13 13.93L7.74 12.81L8.41 11.78L9.15 10.83L9.95 9.95L10.83 9.15L11.78 8.41L12.81 7.74L13.93 7.13L15.14 6.57L16.46 6.08L17.90 5.63L19.49 5.25L21.24 4.91L23.21 4.63L25.46 4.40L28.10 4.23L31.36 4.10L35.87 4.03L50.00 4.00L64.13 4.03L68.64 4.10L71.90 4.23L74.54 4.40L76.79 4.63L78.76 4.91L80.51 5.25L82.10 5.63L83.54 6.08L84.86 6.57L86.07 7.13L87.19 7.74L88.22 8.41L89.17 9.15L90.05 9.95L90.85 10.83L91.59 11.78L92.26 12.81L92.87 13.93L93.43 15.14L93.92 16.46L94.37 17.90L94.75 19.49L95.09 21.24L95.37 23.21L95.60 25.46L95.77 28.10L95.90 31.36L95.97 35.87Z"/></clipPath><linearGradient id="g" x1="0" y1="0" x2="0" y2="1"><stop offset="0" stop-color="#049cbd"/><stop offset="1" stop-color="#00829e"/></linearGradient><filter id="h" x="-40%" y="-60%" width="180%" height="220%"><feGaussianBlur stdDeviation="5.5"/></filter></defs><g clip-path="url(#s)"><rect width="100" height="100" fill="url(#g)"/><g filter="url(#h)" opacity=".7"><rect x="4.00" y="31.6" width="1.17" height="21.9" fill="#7fcee8"/><rect x="5.13" y="21.3" width="1.14" height="31.3" fill="#9ce5fd"/><rect x="6.84" y="18.3" width="0.62" height="33.1" fill="#90e4ff"/><rect x="8.59" y="27.1" width="0.81" height="23.0" fill="#72dbfd"/><rect x="10.07" y="27.1" width="1.10" height="22.1" fill="#76dcfa"/><rect x="12.28" y="14.7" width="1.28" height="33.0" fill="#7adff9"/><rect x="13.44" y="15.8" width="0.72" height="31.3" fill="#9addee"/><rect x="15.08" y="28.1" width="1.01" height="18.1" fill="#8bd2ec"/><rect x="16.62" y="34.5" width="0.67" height="11.0" fill="#b4ebff"/><rect x="17.74" y="30.3" width="1.10" height="14.8" fill="#99daf2"/><rect x="18.98" y="22.1" width="1.15" height="22.5" fill="#89d4f2"/><rect x="20.67" y="20.4" width="0.74" height="23.7" fill="#a6e8ff"/><rect x="22.88" y="30.4" width="0.95" height="13.3" fill="#b2ebff"/><rect x="24.29" y="25.9" width="0.60" height="17.7" fill="#adedff"/><rect x="26.55" y="8.9" width="1.00" height="34.7" fill="#7ed3f3"/><rect x="28.40" y="13.4" width="1.25" height="30.3" fill="#98e7ff"/><rect x="29.69" y="21.4" width="1.29" height="22.3" fill="#9be2fc"/><rect x="30.94" y="22.6" width="0.76" height="21.3" fill="#76dcff"/><rect x="32.41" y="15.5" width="1.16" height="28.7" fill="#a8e6ff"/><rect x="34.24" y="13.7" width="0.95" height="30.7" fill="#9ae1fe"/><rect x="35.92" y="26.7" width="0.77" height="17.9" fill="#7edbfe"/><rect x="37.29" y="33.8" width="1.08" height="11.0" fill="#5fcef2"/><rect x="38.77" y="30.0" width="1.22" height="14.9" fill="#bfecff"/><rect x="40.88" y="19.5" width="0.96" height="25.6" fill="#86d1eb"/><rect x="43.05" y="28.2" width="1.10" height="17.0" fill="#8adffa"/><rect x="45.15" y="26.8" width="0.87" height="18.4" fill="#6fd8f8"/><rect x="46.88" y="12.6" width="1.01" height="32.4" fill="#ace8fe"/><rect x="47.98" y="8.7" width="1.15" height="36.2" fill="#a3e9fe"/><rect x="49.52" y="15.4" width="1.16" height="29.2" fill="#97dcf4"/><rect x="50.97" y="23.6" width="0.98" height="20.8" fill="#88e1fe"/><rect x="53.09" y="17.8" width="1.08" height="26.1" fill="#9addf6"/><rect x="55.28" y="14.3" width="0.64" height="29.0" fill="#b5efff"/><rect x="57.13" y="28.2" width="0.88" height="14.7" fill="#7edbf9"/><rect x="59.43" y="29.3" width="1.00" height="12.9" fill="#c0efff"/><rect x="61.19" y="17.3" width="0.86" height="24.6" fill="#73ddf7"/><rect x="62.68" y="16.8" width="1.16" height="24.9" fill="#a1e5ff"/><rect x="64.56" y="25.2" width="0.98" height="16.2" fill="#88e5ff"/><rect x="66.22" y="20.9" width="1.28" height="20.4" fill="#82e5fe"/><rect x="67.76" y="8.5" width="1.24" height="32.9" fill="#88e6fe"/><rect x="69.71" y="7.4" width="1.23" height="34.2" fill="#8fdbf7"/><rect x="71.24" y="18.3" width="0.71" height="23.4" fill="#aeeaff"/><rect x="72.69" y="22.7" width="1.28" height="19.4" fill="#84d8f5"/><rect x="74.58" y="15.1" width="0.81" height="27.7" fill="#81e1ff"/><rect x="76.77" y="19.3" width="0.73" height="24.4" fill="#7de1fe"/><rect x="78.73" y="33.8" width="0.79" height="11.0" fill="#8dd2ed"/><rect x="80.46" y="32.3" width="0.92" height="13.6" fill="#71d9f5"/><rect x="81.67" y="24.0" width="1.05" height="22.6" fill="#b2e8fe"/><rect x="83.95" y="23.6" width="0.71" height="24.6" fill="#8ce7ff"/><rect x="85.30" y="31.0" width="0.88" height="18.0" fill="#97dbef"/><rect x="87.05" y="29.5" width="1.06" height="20.8" fill="#a3ecfe"/><rect x="88.76" y="17.7" width="0.68" height="33.8" fill="#88defc"/><rect x="90.97" y="20.9" width="0.62" height="32.1" fill="#8ccee5"/><rect x="92.72" y="34.3" width="0.95" height="19.8" fill="#84e6fd"/><rect x="93.83" y="36.0" width="0.99" height="18.7" fill="#7cd0e7"/><rect x="95.31" y="30.1" width="1.01" height="25.4" fill="#91e3ff"/></g></g><path d="M96.00 50.00L95.97 64.13L95.90 68.64L95.77 71.90L95.60 74.54L95.37 76.79L95.09 78.76L94.75 80.51L94.37 82.10L93.92 83.54L93.43 84.86L92.87 86.07L92.26 87.19L91.59 88.22L90.85 89.17L90.05 90.05L89.17 90.85L88.22 91.59L87.19 92.26L86.07 92.87L84.86 93.43L83.54 93.92L82.10 94.37L80.51 94.75L78.76 95.09L76.79 95.37L74.54 95.60L71.90 95.77L68.64 95.90L64.13 95.97L50.00 96.00L35.87 95.97L31.36 95.90L28.10 95.77L25.46 95.60L23.21 95.37L21.24 95.09L19.49 94.75L17.90 94.37L16.46 93.92L15.14 93.43L13.93 92.87L12.81 92.26L11.78 91.59L10.83 90.85L9.95 90.05L9.15 89.17L8.41 88.22L7.74 87.19L7.13 86.07L6.57 84.86L6.08 83.54L5.63 82.10L5.25 80.51L4.91 78.76L4.63 76.79L4.40 74.54L4.23 71.90L4.10 68.64L4.03 64.13L4.00 50.00L4.03 35.87L4.10 31.36L4.23 28.10L4.40 25.46L4.63 23.21L4.91 21.24L5.25 19.49L5.63 17.90L6.08 16.46L6.57 15.14L7.13 13.93L7.74 12.81L8.41 11.78L9.15 10.83L9.95 9.95L10.83 9.15L11.78 8.41L12.81 7.74L13.93 7.13L15.14 6.57L16.46 6.08L17.90 5.63L19.49 5.25L21.24 4.91L23.21 4.63L25.46 4.40L28.10 4.23L31.36 4.10L35.87 4.03L50.00 4.00L64.13 4.03L68.64 4.10L71.90 4.23L74.54 4.40L76.79 4.63L78.76 4.91L80.51 5.25L82.10 5.63L83.54 6.08L84.86 6.57L86.07 7.13L87.19 7.74L88.22 8.41L89.17 9.15L90.05 9.95L90.85 10.83L91.59 11.78L92.26 12.81L92.87 13.93L93.43 15.14L93.92 16.46L94.37 17.90L94.75 19.49L95.09 21.24L95.37 23.21L95.60 25.46L95.77 28.10L95.90 31.36L95.97 35.87Z" fill="none" stroke="#fff" stroke-opacity=".18" stroke-width="1"/><rect x="33" y="21" width="47" height="33" rx="12" fill="#fff" opacity=".5"/><path d="M26 36h32a12 12 0 0 1 12 12v14a12 12 0 0 1-12 12H40l-12 10v-10a12 12 0 0 1-12-12V48a12 12 0 0 1 12-12z" fill="#fff"/><g fill="#056b83"><rect x="28" y="51" width="5" height="12" rx="2.5"/><rect x="37" y="46" width="5" height="22" rx="2.5"/><rect x="46" y="50" width="5" height="14" rx="2.5"/><rect x="55" y="53" width="5" height="8" rx="2.5"/></g></svg> |
diff --git a/internal/calls/static/theme.css b/internal/calls/static/theme.css| index 5da4384..b38a101 100644 |
| --- a/internal/calls/static/theme.css |
| +++ b/internal/calls/static/theme.css |
| @@ -1,169 +1,73 @@ |
| -/* day — rastrillo's default theme: an everyday blue on white and grey. |
| - Structure lives in tokens.css; this file is colour, type and shape. |
| - rastrillo new writes it once as static/theme.css. |
| - |
| - The look: the ordinary, personable interface. A white page, a plain |
| - grey text scale, one friendly blue that means "this does something", |
| - and the conventional green/amber/red for status. Nothing here is |
| - trying to be memorable — day is the theme an app ships on while it |
| - works out what it wants to look like, and the one that never gets in |
| - the way of the content. Semantic status colours are functional and |
| - never the accent, so a pill can never be mistaken for a link. |
| +/* estilo — the Oficina suite's theme: Calma. |
| + |
| + Calma replaced rastrillo's day on 2026-09-29, by Paul's decision after |
| + six rounds of design directions (AGENTS.md, decisions table, row 8). |
| + Until then estilo WAS day, byte for byte; it is now its own theme, and |
| + theme_test.go gates it on its own terms: the same token set day |
| + declares (so rastrillo's tokens.css finds every name it uses), every |
| + contrast pair rastrillo gates, in both schemes — for this file AND for |
| + every app's accent block (apps.go) — and a golden per app so no value |
| + moves without the diff saying so. |
| + |
| + The look: quiet, even and exact. A cool off-white page with white |
| + cards, one grey text scale, soft 12px shapes with a long low shadow. |
| + Colour belongs to the apps: every app's hue sits on one ring of equal |
| + OKLCH lightness, so no app shouts over another, and the interface |
| + tints to the app you are in (apps.go — --rst-accent and friends are |
| + re-declared per app). This file's own accent is Oficina's, the suite's, |
| + used where no app is in charge (sign-in, the team's home). |
| + |
| + Status tones are day's, unchanged: they are functional, not brand, and |
| + a pill must never be mistaken for a link. |
| ── One block, both schemes ─────────────────────────────────────────── |
| - Every token is declared once, as light-dark(<light>, <dark>), under a |
| - single :root that sets color-scheme: light dark. The browser picks the |
| - half that matches the resolved scheme, so there is no second copy of |
| - the palette to keep in sync and no way to author dark half-done. The |
| - two rules at the bottom are the whole toggle: setting color-scheme on |
| - :root[data-theme=…] re-resolves every light-dark() in the file at |
| - once, in both directions, which is why an explicit choice beats the OS |
| - without restating a single colour. |
| - |
| - Tokens with one value in both schemes — the font stack, the radii — |
| - are written plain, because light-dark(x, x) says nothing twice. |
| - |
| - light-dark() is a colour function: it may only stand where a <color> |
| - is expected. So a shadow token wraps its colour in it and writes the |
| - geometry once, outside the call — `0 8px 24px light-dark(a, b)`, never |
| - `light-dark(0 8px 24px a, …)`, which no browser would accept as a |
| - box-shadow. |
| - |
| - ── The shape axis ──────────────────────────────────────────────────── |
| - Radius and shadow are the theme's now, not tokens.css's: a theme that |
| - can only change colour cannot change how an app feels. day is soft and |
| - unremarkable — 8px cards, 6px controls, shadows with a wide blur and |
| - little alpha, the depth of paper resting on paper. |
| - |
| - ── WCAG 2.2 AA, measured ───────────────────────────────────────────── |
| - Normal text needs 4.5:1; large text and UI component boundaries need |
| - 3:1. Every pair below was computed from these exact hex values, in |
| - both schemes. If you change a token, recompute its rows. |
| - |
| - LIGHT ratio requirement |
| - --rst-text on --rst-surface 16.91 4.5:1 text |
| - --rst-text on --rst-bg 16.91 4.5:1 text |
| - --rst-text on --rst-surface-2 15.77 4.5:1 text |
| - --rst-text on --rst-accent-soft 15.21 4.5:1 text |
| - --rst-text-muted on --rst-surface 7.56 4.5:1 text |
| - --rst-text-muted on --rst-bg 7.56 4.5:1 text |
| - --rst-text-muted on --rst-surface-2 7.05 4.5:1 text |
| - --rst-text-muted on --rst-accent-soft 6.80 4.5:1 text |
| - --rst-text-faint on --rst-surface 5.29 4.5:1 text |
| - --rst-text-faint on --rst-bg 5.29 4.5:1 text |
| - --rst-text-faint on --rst-surface-2 4.93 4.5:1 text |
| - --rst-text-faint on --rst-accent-soft 4.76 4.5:1 text |
| - --rst-accent on --rst-surface 5.28 4.5:1 text + focus ring |
| - --rst-accent on --rst-bg 5.28 4.5:1 text + focus ring |
| - --rst-accent on --rst-surface-2 4.93 4.5:1 text |
| - --rst-accent on --rst-accent-soft 4.75 4.5:1 text |
| - --rst-on-accent on --rst-accent 5.28 4.5:1 button label |
| - --rst-on-accent on --rst-accent-strong 7.18 4.5:1 button label, hover |
| - --rst-line-strong on --rst-surface 3.63 3:1 control border |
| - --rst-line-strong on --rst-bg 3.63 3:1 control border |
| - --rst-line-strong on --rst-surface-2 3.39 3:1 control border |
| - pill neutral fg on its own tint 9.02 4.5:1 text |
| - pill positive fg on its own tint 6.49 4.5:1 text |
| - pill warning fg on its own tint 6.15 4.5:1 text |
| - pill negative fg on its own tint 5.30 4.5:1 text |
| - --rst-on-accent on negative fg (fill) 6.47 4.5:1 danger button label |
| - |
| - DARK ratio requirement |
| - --rst-text on --rst-surface 13.74 4.5:1 text |
| - --rst-text on --rst-bg 15.32 4.5:1 text |
| - --rst-text on --rst-surface-2 14.63 4.5:1 text |
| - --rst-text on --rst-accent-soft 13.02 4.5:1 text |
| - --rst-text-muted on --rst-surface 7.56 4.5:1 text |
| - --rst-text-muted on --rst-bg 8.43 4.5:1 text |
| - --rst-text-muted on --rst-surface-2 8.05 4.5:1 text |
| - --rst-text-muted on --rst-accent-soft 7.16 4.5:1 text |
| - --rst-text-faint on --rst-surface 6.33 4.5:1 text |
| - --rst-text-faint on --rst-bg 7.06 4.5:1 text |
| - --rst-text-faint on --rst-surface-2 6.74 4.5:1 text |
| - --rst-text-faint on --rst-accent-soft 6.00 4.5:1 text |
| - --rst-accent on --rst-surface 6.95 4.5:1 text + focus ring |
| - --rst-accent on --rst-bg 7.75 4.5:1 text + focus ring |
| - --rst-accent on --rst-surface-2 7.40 4.5:1 text |
| - --rst-accent on --rst-accent-soft 6.59 4.5:1 text |
| - --rst-on-accent on --rst-accent 7.86 4.5:1 button label |
| - --rst-on-accent on --rst-accent-strong 10.29 4.5:1 button label, hover |
| - --rst-line-strong on --rst-surface 4.26 3:1 control border |
| - --rst-line-strong on --rst-bg 4.75 3:1 control border |
| - --rst-line-strong on --rst-surface-2 4.53 3:1 control border |
| - pill neutral fg on its own tint 8.44 4.5:1 text |
| - pill positive fg on its own tint 10.18 4.5:1 text |
| - pill warning fg on its own tint 9.62 4.5:1 text |
| - pill negative fg on its own tint 7.85 4.5:1 text |
| - --rst-on-accent on negative fg (fill) 8.99 4.5:1 danger button label |
| - |
| - The tightest pair in the set is --rst-accent on --rst-accent-soft in |
| - light, at 4.75:1 against a 4.5:1 floor. Put a token on a surface not |
| - listed above and you are guessing; recompute first. |
| - |
| - --rst-line is a hairline divider between rows, not a control border or |
| - a meaningful graphic, so 1.4.11's 3:1 does not apply to it. Control |
| - borders use --rst-line-strong, which does clear 3:1. |
| - |
| - --rst-header-rule is not in the table either, and deliberately so |
| - (design doc §6-v2.2): the page header's rule is decoration, not |
| - structure — the heading's size, weight and spacing carry the |
| - structure — so no contrast floor applies to it and it is not in |
| - ui/contrast_test.go's pair table. Do not argue it up to 3:1. |
| - |
| - Pagination chips are the one deliberate exception: they are bordered |
| - with --rst-line rather than --rst-line-strong, because a page strip |
| - ringed in hard outlines shouts louder than the list it belongs to. |
| - 1.4.11 is satisfied without that border — each chip's meaning is |
| - carried by its text label at 4.5:1 or better, and the current page |
| - adds a filled background, a heavier weight and aria-current on top. |
| - |
| - --rst-shadow-pop, --rst-shadow-knob, --rst-shadow-lift and |
| - --rst-overlay are not in the table: they paint a translucent shadow or |
| - scrim over whatever sits underneath, not text over a fixed |
| - background, so a contrast ratio does not apply. The scrim deepens in |
| - dark, matching --rst-shadow-pop's own jump: black reads lighter |
| - against a dark backdrop, so the overlay needs more alpha to still |
| - read as a dimming layer. |
| + As day: every colour is light-dark(<light>, <dark>) under one :root |
| + with color-scheme: light dark, and the two [data-theme] rules at the |
| + bottom are the whole toggle. |
| + |
| + ── WCAG 2.2 AA ─────────────────────────────────────────────────────── |
| + Every pair rastrillo's own gate checks is checked by |
| + TestContrastMeetsWCAG, for this file and each app's accent, light and |
| + dark, through rastrillo's ui.ContrastRatio. The tightest, at the time |
| + of writing: faint text on an accent-tinted surface, 4.63:1 (Files, |
| + dark); a control border on the sunk surface, 3.2:1 (light). |
| ──────────────────────────────────────────────────────────────────── */ |
| :root { |
| color-scheme: light dark; |
| - /* Type: the family only. Sizes and spacing are structural and stay in |
| - tokens.css. */ |
| - --rst-font: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; |
| + /* Type: the family only. Sizes and spacing stay in tokens.css. Onest |
| + where it is served (fonts.go), the system face where it is not. */ |
| + --rst-font: "Onest", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; |
| - /* Shape: soft, ordinary, unremarkable. */ |
| - --rst-radius: 8px; |
| - --rst-radius-sm: 6px; |
| + /* Shape: soft and exact. */ |
| + --rst-radius: 12px; |
| + --rst-radius-sm: 8px; |
| --rst-radius-pill: 999px; |
| - /* Surfaces and lines */ |
| - --rst-bg: light-dark(#ffffff, #111418); |
| - --rst-surface: light-dark(#ffffff, #1a1f26); |
| - --rst-surface-2: light-dark(#f6f7f8, #15191f); |
| - --rst-line: light-dark(#e5e7eb, #2a3038); |
| - --rst-line-strong: light-dark(#7f8792, #79828e); |
| - |
| - /* The page header's rule, derived rather than authored: the accent |
| - folded into the line at 18%, so a theme that changes its accent |
| - gets a matching rule with no second value to keep in step. day's |
| - is barely there — a hairline you would call grey until you put it |
| - beside plain's. Decorative: it carries no contrast floor. */ |
| + /* Surfaces and lines: a cool off-white page, white cards, a sunk grey. */ |
| + --rst-bg: light-dark(#f5f6f8, #15171c); |
| + --rst-surface: light-dark(#ffffff, #1c1f26); |
| + --rst-surface-2: light-dark(#eceef2, #23262e); |
| + --rst-line: light-dark(#e3e6eb, #2d313a); |
| + --rst-line-strong: light-dark(#7f8591, #7a818e); |
| + |
| + /* The page header's rule: the accent folded into the line, as day. */ |
| --rst-header-rule: color-mix(in oklab, var(--rst-accent) 18%, var(--rst-line)); |
| /* Text */ |
| - --rst-text: light-dark(#1a1d21, #e8eaed); |
| - --rst-text-muted: light-dark(#4b5563, #a8b0ba); |
| - --rst-text-faint: light-dark(#656c78, #98a1ac); |
| - |
| - /* Accent */ |
| - --rst-accent: light-dark(#2464e0, #7ba7ff); |
| - --rst-accent-strong: light-dark(#1a4fc0, #a3c0ff); |
| - --rst-accent-soft: light-dark(#eef3fe, #17233a); |
| - --rst-on-accent: light-dark(#ffffff, #0b1220); |
| - |
| - /* Status tones */ |
| + --rst-text: light-dark(#262a33, #eceef2); |
| + --rst-text-muted: light-dark(#565c69, #b4bac6); |
| + --rst-text-faint: light-dark(#626875, #8f96a3); |
| + |
| + /* Accent: Oficina's, hue 262 on the ring (apps.go). Each app |
| + re-declares these four. */ |
| + --rst-accent: light-dark(#2e5bb4, #87b1fd); |
| + --rst-accent-strong: light-dark(#214a9b, #afcbfe); |
| + --rst-accent-soft: light-dark(#e9f1ff, #1f2b42); |
| + --rst-on-accent: light-dark(#ffffff, #111418); |
| + |
| + /* Status tones: day's, unchanged. */ |
| --rst-tone-neutral-fg: light-dark(#374151, #c3c9d1); |
| --rst-tone-neutral-bg: light-dark(#eef0f2, #262c34); |
| --rst-tone-positive-fg: light-dark(#166534, #6ee7a8); |
| @@ -173,11 +77,11 @@ |
| --rst-tone-negative-fg: light-dark(#b91c1c, #f79aa0); |
| --rst-tone-negative-bg: light-dark(#fee2e2, #331819); |
| - /* Depth */ |
| - --rst-shadow-pop: 0 8px 24px light-dark(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.5)); |
| - --rst-shadow-knob: 0 1px 2px rgba(0, 0, 0, 0.3); |
| - --rst-shadow-lift: 0 1px 2px rgba(0, 0, 0, 0.08); |
| - --rst-overlay: light-dark(rgba(0, 0, 0, 0.45), rgba(0, 0, 0, 0.6)); |
| + /* Depth: a long, low, cool shadow; paper lifted, not stacked. */ |
| + --rst-shadow-pop: 0 18px 44px -14px light-dark(rgba(20, 24, 33, 0.28), rgba(0, 0, 0, 0.6)); |
| + --rst-shadow-knob: 0 1px 2px rgba(20, 24, 33, 0.3); |
| + --rst-shadow-lift: 0 1px 1px rgba(20, 24, 33, 0.04), 0 14px 36px -14px light-dark(rgba(20, 24, 33, 0.22), rgba(0, 0, 0, 0.55)); |
| + --rst-overlay: light-dark(rgba(20, 24, 33, 0.45), rgba(0, 0, 0, 0.6)); |
| } |
| /* The whole toggle. Setting color-scheme re-resolves every light-dark() |
| @@ -185,3 +89,11 @@ |
| restating a colour. */ |
| :root[data-theme="light"] { color-scheme: light; } |
| :root[data-theme="dark"] { color-scheme: dark; } |
| + |
| +/* The accent for Calls: hue 220 on Calma's ring (estilo theme/apps.go). */ |
| +:root { |
| + --rst-accent: light-dark(#056b83, #42c2e6); |
| + --rst-accent-strong: light-dark(#01596d, #84d9f3); |
| + --rst-accent-soft: light-dark(#dff5fc, #0b303b); |
| + --rst-on-accent: light-dark(#ffffff, #111418); |
| +} |
diff --git a/internal/calls/templates/layout.html b/internal/calls/templates/layout.html| index 7c6e75f..bbf4a98 100644 |
| --- a/internal/calls/templates/layout.html |
| +++ b/internal/calls/templates/layout.html |
| @@ -8,6 +8,7 @@ |
| <meta charset="utf-8"> |
| <meta name="viewport" content="width=device-width, initial-scale=1"> |
| <title>{{block "title" .}}Calls{{end}}</title> |
| +<link rel="stylesheet" href="/static/estilo/fonts/v1/fonts.css"> |
| <link rel="stylesheet" href="{{asset "static/tokens.css"}}"> |
| <link rel="stylesheet" href="{{asset "static/theme.css"}}"> |
| <link rel="stylesheet" href="{{asset "static/callui.css"}}"> |
diff --git a/internal/callstest/fontlink_test.go b/internal/callstest/fontlink_test.go| new file mode 100644 |
| index 0000000..358bb10 |
| --- /dev/null |
| +++ b/internal/callstest/fontlink_test.go |
| @@ -0,0 +1,24 @@ |
| +package callstest |
| + |
| +import ( |
| + "bytes" |
| + "os" |
| + "path/filepath" |
| + "testing" |
| + |
| + "amadan.net/oficina/estilo.git/theme" |
| +) |
| + |
| +// The layout names Onest's stylesheet by a literal path; this keeps that |
| +// literal equal to estilo's versioned prefix, so an estilo font move |
| +// fails here rather than every page quietly falling back to the system |
| +// face. |
| +func TestLayoutLinksEstilosFonts(t *testing.T) { |
| + layout, err := os.ReadFile(filepath.Join("..", "calls", "templates", "layout.html")) |
| + if err != nil { |
| + t.Fatal(err) |
| + } |
| + if want := `href="` + theme.FontPrefix + `fonts.css"`; !bytes.Contains(layout, []byte(want)) { |
| + t.Errorf("layout.html does not link %s", want) |
| + } |
| +} |
diff --git a/internal/callstest/vendored_test.go b/internal/callstest/vendored_test.go| index ce39bf7..a9f4eaf 100644 |
| --- a/internal/callstest/vendored_test.go |
| +++ b/internal/callstest/vendored_test.go |
| @@ -6,6 +6,7 @@ import ( |
| "path/filepath" |
| "testing" |
| + "amadan.net/oficina/estilo.git/theme" |
| "amadan.net/rastrillo/rastrillo/ui" |
| ) |
| @@ -16,13 +17,10 @@ import ( |
| // to re-copy is caught instead of drifting silently. If you edit one |
| // DELIBERATELY, delete its line below — the file is yours. |
| func TestVendoredAssetsMatchTheLibrary(t *testing.T) { |
| - theme, ok := ui.ThemeCSS("day") |
| - if !ok { |
| - t.Fatal("ui: no \"day\" theme shipped") |
| - } |
| + // theme.css is no longer day's: it is Calma with Calls' accent, from |
| + // estilo (estilo AGENTS.md, decisions table, row 8), pinned below. |
| for name, lib := range map[string][]byte{ |
| "tokens.css": ui.TokensCSS(), |
| - "theme.css": theme, |
| "rastrillo.js": ui.ShimJS(), |
| "select.js": ui.SelectJS(), |
| } { |
| @@ -36,3 +34,19 @@ func TestVendoredAssetsMatchTheLibrary(t *testing.T) { |
| } |
| } |
| } |
| + |
| +// static/theme.css pinned to the estilo this app is built against. After |
| +// an estilo upgrade, re-write it with `go run ./scripts/writetheme`. |
| +func TestThemeIsEstilosForCalls(t *testing.T) { |
| + want, ok := theme.ForApp("calls") |
| + if !ok { |
| + t.Fatal("estilo's theme ring has no calls") |
| + } |
| + got, err := os.ReadFile(filepath.Join("..", "calls", "static", "theme.css")) |
| + if err != nil { |
| + t.Fatal(err) |
| + } |
| + if !bytes.Equal(got, want) { |
| + t.Error("static/theme.css differs from estilo's theme for calls; run go run ./scripts/writetheme") |
| + } |
| +} |
diff --git a/native/apple/Sources/CallsMac/Resources/AppIcon.png b/native/apple/Sources/CallsMac/Resources/AppIcon.png| index 29baeff..f0de939 100644 |
| Binary files a/native/apple/Sources/CallsMac/Resources/AppIcon.png and b/native/apple/Sources/CallsMac/Resources/AppIcon.png differ |
diff --git a/native/apple/Sources/CallsMac/Resources/MacIcon.png b/native/apple/Sources/CallsMac/Resources/MacIcon.png| index a4b6202..f0de939 100644 |
| Binary files a/native/apple/Sources/CallsMac/Resources/MacIcon.png and b/native/apple/Sources/CallsMac/Resources/MacIcon.png differ |
diff --git a/native/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/native/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png| index 29baeff..be9e4af 100644 |
| Binary files a/native/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png and b/native/ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ |
diff --git a/scripts/writetheme/main.go b/scripts/writetheme/main.go| new file mode 100644 |
| index 0000000..290a89a |
| --- /dev/null |
| +++ b/scripts/writetheme/main.go |
| @@ -0,0 +1,21 @@ |
| +// Command writetheme re-writes internal/calls/static/theme.css from the |
| +// estilo this module pins: Calma, with Calls' accent. Run it from the |
| +// repository root after upgrading estilo; TestThemeIsEstilosForCalls |
| +// fails until you do. |
| +package main |
| + |
| +import ( |
| + "os" |
| + |
| + "amadan.net/oficina/estilo.git/theme" |
| +) |
| + |
| +func main() { |
| + css, ok := theme.ForApp("calls") |
| + if !ok { |
| + panic("estilo's theme ring has no calls") |
| + } |
| + if err := os.WriteFile("internal/calls/static/theme.css", css, 0o644); err != nil { |
| + panic(err) |
| + } |
| +} |