Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci-oss-assets-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,24 @@ jobs:
- name: Check for proprietary fonts in dist
run: |
set -euo pipefail
echo '🔍 Checking dist for proprietary ABCROM fonts...'
echo '🔍 Checking dist for proprietary fonts...'

if [ ! -d "dist" ] || [ -z "$(ls -A dist)" ]; then
echo '❌ ERROR: dist/ directory missing or empty!'
exit 1
fi

# Check for ABCROM font files
if find dist/ -type f -iname '*abcrom*' \
# Check for ABCROM and PP Formula font files
if find dist/ -type f \( -iname '*abcrom*' -o -iname '*ppformula*' \) \
\( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \) \
-print -quit | grep -q .; then
echo ''
echo '❌ ERROR: Found proprietary ABCROM font files in dist!'
echo '❌ ERROR: Found proprietary font files in dist!'
echo ''
find dist/ -type f -iname '*abcrom*' \
find dist/ -type f \( -iname '*abcrom*' -o -iname '*ppformula*' \) \
\( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \)
echo ''
echo 'ABCROM fonts are proprietary and should not ship to OSS builds.'
echo 'ABCROM and PP Formula fonts are proprietary and should not ship to OSS builds.'
echo ''
echo 'To fix this:'
echo '1. Use conditional font loading based on isCloud'
Expand Down
5 changes: 5 additions & 0 deletions packages/design-system/src/css/_palette.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
@theme {
/* Font Families */
--font-inter: 'Inter', sans-serif;
--font-formula: 'PP Formula', 'Inter', sans-serif;

/* Palette Colors */
--color-transparency-white-t8: rgb(255 255 255 / 0.08);
--color-transparency-white-t20: rgb(255 255 255 / 0.2);
--color-transparency-white-t40: rgb(255 255 255 / 0.4);

--color-charcoal-100: #55565e;
--color-charcoal-200: #494a50;
--color-charcoal-300: #3c3d42;
Expand Down
2 changes: 2 additions & 0 deletions packages/design-system/src/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@

--color-primary-comfy-ink: #211927;
--color-primary-comfy-canvas: #c2bfb9;
--color-primary-warm-white: #f0efed;
--color-primary-warm-gray: #7e7c78;

--color-danger-100: #c02323;
--color-danger-200: #d62952;
Expand Down
42 changes: 16 additions & 26 deletions src/platform/cloud/onboarding/assets/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
/* ABC ROM Extended — full face mapping */
@font-face {
font-family: 'ABC ROM Extended';
src:
local('ABC ROM Extended Black Italic'),
local('ABCRom BlackItalic'),
url('../fonts/ABCROMExtended-BlackItalic.woff2') format('woff2'),
url('../fonts/ABCROMExtended-BlackItalic.woff') format('woff');
font-weight: 900;
font-style: italic;
font-family: 'PP Formula';
src: url('../fonts/PPFormula-Light.woff2') format('woff2');
font-weight: 300;
font-style: normal;
font-display: swap;
}

/* Prevent browser from synthesizing fake bold/italic which can cause mismatches */
.hero-title,
.font-abcrom {
font-family: 'ABC ROM Extended', sans-serif;
font-synthesis: none; /* no faux bold/italic */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-rendering: optimizeLegibility;
@font-face {
font-family: 'PP Formula';
src: url('../fonts/PPFormula-Medium.woff2') format('woff2');
font-weight: 500;
font-style: normal;
font-display: swap;
}

/* Figma-like hero style */
.hero-title {
font-size: 32px;
font-weight: 900;
font-style: italic;
text-transform: uppercase;
text-shadow: 0 4px 4px rgb(0 0 0 / 0.25);
/* Figma has leading-trim/text-edge which CSS doesn't support; emulate with tight line-height */
line-height: 1.1;
@font-face {
font-family: 'PP Formula';
src: url('../fonts/PPFormula-Semibold.woff2') format('woff2');
font-weight: 600;
font-style: normal;
font-display: swap;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 2 additions & 3 deletions vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,13 @@ export default defineConfig({
tailwindcss(),
typegpuPlugin({}),
comfyAPIPlugin(IS_DEV),
// Exclude proprietary ABCROM fonts from non-cloud builds
// Exclude proprietary fonts from non-cloud builds
{
name: 'exclude-proprietary-fonts',
generateBundle(_options, bundle) {
if (DISTRIBUTION !== 'cloud') {
// Remove ABCROM font files from bundle
for (const [fileName] of Object.entries(bundle)) {
if (/ABCROM.*\.(woff2?|ttf|otf)$/i.test(fileName)) {
if (/(ABCROM|PPFormula).*\.(woff2?|ttf|otf)$/i.test(fileName)) {
delete bundle[fileName]
}
}
Expand Down
Loading