Skip to content

Commit 9371415

Browse files
committed
Add BerkeleyMono font with S3 download for release builds
1 parent ed773de commit 9371415

File tree

4 files changed

+59
-10
lines changed

4 files changed

+59
-10
lines changed

.github/workflows/twig-release.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
jobs:
1313
publish:
1414
runs-on: macos-latest
15+
permissions:
16+
id-token: write
17+
contents: write
1518
env:
1619
NODE_OPTIONS: "--max-old-space-size=8192"
1720
NODE_ENV: production
@@ -68,6 +71,17 @@ jobs:
6871
- name: Install dependencies
6972
run: pnpm install --frozen-lockfile
7073

74+
- name: Configure AWS credentials
75+
uses: aws-actions/configure-aws-credentials@v4
76+
with:
77+
role-to-assume: ${{ secrets.AWS_TWIG_APP_ASSETS_ROLE_ARN }}
78+
aws-region: ${{ secrets.AWS_TWIG_APP_ASSETS_REGION }}
79+
mask-aws-account-id: true
80+
unset-current-credentials: true
81+
82+
- name: Download BerkeleyMono fonts from S3
83+
run: aws s3 cp s3://${{ secrets.AWS_TWIG_APP_ASSETS_BUCKET }}/fonts/ apps/twig/assets/fonts/BerkeleyMono/ --recursive
84+
7185
- name: Build electron-trpc package
7286
run: pnpm --filter @posthog/electron-trpc run build
7387

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,6 @@ test-results/
5050

5151
# Downloaded binaries
5252
apps/twig/resources/codex-acp/
53+
54+
# Licensed fonts (downloaded from S3 during CI)
55+
apps/twig/assets/fonts/BerkeleyMono/

apps/twig/src/renderer/styles/globals.css

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22
@tailwind components;
33
@tailwind utilities;
44

5+
@font-face {
6+
font-family: "Berkeley Mono";
7+
src: url("/assets/fonts/BerkeleyMono/BerkeleyMono-Regular.woff2")
8+
format("woff2");
9+
font-weight: 400;
10+
font-style: normal;
11+
}
12+
13+
@font-face {
14+
font-family: "Berkeley Mono";
15+
src: url("/assets/fonts/BerkeleyMono/BerkeleyMono-Oblique.woff2")
16+
format("woff2");
17+
font-weight: 400;
18+
font-style: italic;
19+
}
20+
21+
@font-face {
22+
font-family: "Berkeley Mono";
23+
src: url("/assets/fonts/BerkeleyMono/BerkeleyMono-Bold.woff2")
24+
format("woff2");
25+
font-weight: 700;
26+
font-style: normal;
27+
}
28+
29+
@font-face {
30+
font-family: "Berkeley Mono";
31+
src: url("/assets/fonts/BerkeleyMono/BerkeleyMono-Bold-Oblique.woff2")
32+
format("woff2");
33+
font-weight: 700;
34+
font-style: italic;
35+
}
36+
537
@font-face {
638
font-family: "JetBrains Mono";
739
src: url("/assets/fonts/JetBrainsMono/JetBrainsMono-Light.woff2")
@@ -131,17 +163,17 @@
131163
.radix-themes {
132164
/* Font families */
133165
--default-font-family:
134-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
166+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
135167
--heading-font-family:
136-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
168+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
137169
--code-font-family:
138-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
170+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
139171
--strong-font-family:
140-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
172+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
141173
--em-font-family:
142-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
174+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
143175
--quote-font-family:
144-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
176+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
145177

146178
/* Font weights - mapped to JetBrains Mono weights */
147179
--font-weight-light: 300;
@@ -156,7 +188,7 @@
156188

157189
body {
158190
font-family:
159-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
191+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
160192
-webkit-font-smoothing: antialiased;
161193
-moz-osx-font-smoothing: grayscale;
162194
}
@@ -211,7 +243,7 @@ body {
211243

212244
.plan-markdown code {
213245
font-family:
214-
"JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
246+
"Berkeley Mono", "JetBrains Mono", "Monaco", "Menlo", "Ubuntu Mono", "Courier New", monospace;
215247
font-size: 11px;
216248
background: rgba(0, 0, 0, 0.2);
217249
padding: 0 4px;
@@ -546,7 +578,7 @@ body {
546578
}
547579

548580
.sidebar-tree {
549-
font-family: "JetBrains Mono", monospace;
581+
font-family: "Berkeley Mono", "JetBrains Mono", monospace;
550582
font-size: 12px;
551583
line-height: 1.5;
552584
color: var(--gray-11);

apps/twig/tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
},
4747
},
4848
fontFamily: {
49-
mono: ["JetBrains Mono", "Consolas", "Monaco", "monospace"],
49+
mono: ["Berkeley Mono", "JetBrains Mono", "Consolas", "Monaco", "monospace"],
5050
},
5151
},
5252
},

0 commit comments

Comments
 (0)