Skip to content
Merged
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
13 changes: 0 additions & 13 deletions browser_tests/fixtures/ComfyPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,6 @@ export class ComfyPage {
}
await this.goto()

// Unify font for consistent screenshots.
await this.page.addStyleTag({
url: 'https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'
})
await this.page.addStyleTag({
url: 'https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'
})
await this.page.addStyleTag({
content: `
* {
font-family: 'Roboto Mono', 'Noto Color Emoji';
}`
})
await this.page.waitForFunction(() => document.fonts.ready)
await this.page.waitForFunction(
() =>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 1 addition & 12 deletions packages/design-system/src/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ body {
max-height: -webkit-fill-available;
min-width: -webkit-fill-available;
max-width: -webkit-fill-available;
font-family: Arial, sans-serif;
font-family: Inter, Arial, sans-serif;
}

.comfy-multiline-input {
Expand Down Expand Up @@ -880,7 +880,6 @@ body {
align-items: center;
color: var(--descrip-text);
background-color: var(--comfy-menu-bg);
font-family: sans-serif;
padding: 10px;
border-radius: 0 8px 8px;
box-shadow: 3px 3px 8px rgb(0 0 0 / 0.4);
Expand Down Expand Up @@ -978,7 +977,6 @@ span.drag-handle {
margin-top: -0.4em;
margin-left: -0.2em;
font-size: 12px;
font-family: sans-serif;
letter-spacing: 2px;
color: var(--drag-text);
text-shadow: 1px 0 1px black;
Expand Down Expand Up @@ -1038,7 +1036,6 @@ button.comfy-queue-btn {
.comfy-modal.comfy-settings,
.comfy-modal.comfy-manage-templates {
text-align: center;
font-family: sans-serif;
color: var(--descrip-text);
z-index: 99;
}
Expand Down Expand Up @@ -1102,7 +1099,6 @@ button.comfy-queue-btn {

.graphdialog .name {
font-size: 14px;
font-family: sans-serif;
color: var(--descrip-text);
}

Expand Down Expand Up @@ -1142,7 +1138,6 @@ dialog::backdrop {
}

.comfy-dialog.comfy-modal {
font-family: Arial, sans-serif;
border-color: var(--bg-color);
box-shadow: none;
border: 2px solid var(--border-color);
Expand Down Expand Up @@ -1172,7 +1167,6 @@ dialog::backdrop {

.litegraph .dialog {
z-index: 1;
font-family: Arial, sans-serif;
}

.litegraph .litemenu-entry.has_submenu {
Expand Down Expand Up @@ -1337,7 +1331,6 @@ audio.comfy-audio.empty-audio-widget {
.maskEditor_sidePanelTitle {
text-align: center;
font-size: 15px;
font-family: sans-serif;
color: var(--descrip-text);
margin-top: 10px;
}
Expand Down Expand Up @@ -1445,7 +1438,6 @@ audio.comfy-audio.empty-audio-widget {
background: rgb(0 0 0 / 0.2);
border: 1px solid var(--border-color);
color: var(--input-text);
font-family: sans-serif;
font-size: 15px;
pointer-events: auto;
transition: background-color 0.1s;
Expand Down Expand Up @@ -1560,7 +1552,6 @@ audio.comfy-audio.empty-audio-widget {
border: 1px solid var(--p-form-field-border-color);
border-radius: 10px;
color: var(--input-text);
font-family: sans-serif;
pointer-events: auto;
transition: 0.1s;
width: 60px;
Expand All @@ -1576,7 +1567,6 @@ audio.comfy-audio.empty-audio-widget {
border: 1px solid var(--p-form-field-border-color);
border-radius: 10px;
color: var(--input-text);
font-family: sans-serif;
pointer-events: auto;
transition: 0.1s;
width: 60px;
Expand Down Expand Up @@ -1764,7 +1754,6 @@ audio.comfy-audio.empty-audio-widget {
.maskEditor_sidePanelSubTitle {
text-align: left;
font-size: 12px;
font-family: sans-serif;
color: var(--descrip-text);
}

Expand Down
1 change: 0 additions & 1 deletion src/components/graph/NodeTooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ useEventListener(window, 'click', hideTooltip)
border-radius: 5px;
box-shadow: 0 0 5px rgb(0 0 0 / 0.4);
color: var(--input-text);
font-family: sans-serif;
left: 0;
max-width: 30vw;
padding: 4px 8px;
Expand Down
1 change: 0 additions & 1 deletion src/components/node/NodePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ const truncateDefaultValue = (value: any, charLimit: number = 32): string => {
}

._sb_node_preview {
font-family: 'Open Sans', sans-serif;
color: var(--descrip-text);
border: 1px solid var(--descrip-text);
min-width: 300px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const modelDef = props.modelDef
<style scoped>
.model_preview {
background-color: var(--comfy-menu-bg);
font-family: 'Open Sans', sans-serif;
color: var(--descrip-text);
border: 1px solid var(--descrip-text);
min-width: 300px;
Expand Down
1 change: 0 additions & 1 deletion src/extensions/core/groupNodeManage.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
background: var(--bg-color);
color: var(--fg-color);
padding: 0;
font-family: Arial, Helvetica, sans-serif;
border-color: black;
margin: 20vh auto;
max-height: 60vh;
Expand Down
6 changes: 0 additions & 6 deletions src/lib/litegraph/public/css/litegraph.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
-moz-user-select: none;
-webkit-user-select: none;
outline: none;
font-family: Tahoma, sans-serif;
}

.lgraphcanvas * {
box-sizing: border-box;
}

.litegraph.litecontextmenu {
font-family: Tahoma, sans-serif;
position: fixed;
top: 100px;
left: 100px;
Expand Down Expand Up @@ -48,7 +46,6 @@
}

.litegraph .litemenubar ul {
font-family: Tahoma, sans-serif;
margin: 0;
padding: 0;
}
Expand Down Expand Up @@ -165,7 +162,6 @@
}

.litegraph.litesearchbox {
font-family: Tahoma, sans-serif;
position: absolute;
background-color: rgba(0, 0, 0, 0.5);
padding-top: 4px;
Expand Down Expand Up @@ -198,7 +194,6 @@
}

.litegraph.lite-search-item {
font-family: Tahoma, sans-serif;
background-color: rgba(0, 0, 0, 0.5);
color: white;
padding-top: 2px;
Expand Down Expand Up @@ -302,7 +297,6 @@

.litegraph .dialog .dialog-header .dialog-title {
font: 1rem;
font-family: Inter, Arial, sans-serif;
margin: 4px;
padding: 4px 10px;
display: inline-block;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/litegraph/src/LiteGraphGlobal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ export class LiteGraphGlobal {
NODE_DEFAULT_SHAPE = RenderShape.ROUND
NODE_BOX_OUTLINE_COLOR = '#FFF'
NODE_ERROR_COLOUR = '#E00'
NODE_FONT = 'Arial'
NODE_FONT = 'Inter'
NODE_DEFAULT_BYPASS_COLOR = '#FF00FF'
NODE_OPACITY = 0.9

DEFAULT_FONT = 'Arial'
DEFAULT_FONT = 'Inter'
DEFAULT_SHADOW_COLOR = 'rgba(0,0,0,0.5)'

DEFAULT_GROUP_FONT = 24
DEFAULT_GROUP_FONT_SIZE?: any
GROUP_FONT = 'Arial'
GROUP_FONT = 'Inter'

WIDGET_BGCOLOR = '#222'
WIDGET_OUTLINE_COLOR = '#666'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/litegraph/src/canvas/InputIndicators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class InputIndicators implements Disposable {
colour1 = '#ff5f00'
colour2 = '#00ff7c'
colour3 = '#dea7ff'
fontString = 'bold 12px Arial'
fontString = 'bold 12px Inter, sans-serif'
// #endregion

// #region state
Expand Down
2 changes: 1 addition & 1 deletion src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export abstract class SubgraphIONodeBase<
editorAlpha?: number
): void {
ctx.fillStyle = '#AAA'
ctx.font = '12px Arial'
ctx.font = '12px Inter, sans-serif'
ctx.textBaseline = 'middle'

for (const slot of this.allSlots) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,13 @@ onMounted(async () => {
.toast-title {
color: white;
font-size: 14px;
font-family: 'Satoshi', sans-serif;
font-weight: 500;
line-height: 18.2px;
}

.toast-version-badge {
color: #a0a1a2;
font-size: 12px;
font-family: 'Satoshi', sans-serif;
font-weight: 500;
line-height: 15.6px;
}
Expand Down Expand Up @@ -253,7 +251,6 @@ onMounted(async () => {
.learn-more-link {
color: #60a5fa;
font-size: 12px;
font-family: 'Inter', sans-serif;
font-weight: 500;
line-height: 15.6px;
text-decoration: none;
Expand All @@ -279,7 +276,6 @@ onMounted(async () => {
border: none;
color: #aeaeb2;
font-size: 12px;
font-family: 'Inter', sans-serif;
font-weight: 500;
cursor: pointer;
}
Expand All @@ -297,7 +293,6 @@ onMounted(async () => {
border: none;
color: black;
font-size: 12px;
font-family: 'Inter', sans-serif;
font-weight: 500;
cursor: pointer;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const renderPreview = (
ctx.roundRect(x, y, sz, sz, [4])
ctx.fill()
ctx.fillStyle = textFill
ctx.font = '12px Arial'
ctx.font = '12px Inter, sans-serif'
ctx.textAlign = 'center'
ctx.fillText(text, x + 15, y + 20)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ LiteGraphGlobal {
},
"ContextMenu": [Function],
"CurveEditor": [Function],
"DEFAULT_FONT": "Arial",
"DEFAULT_FONT": "Inter",
"DEFAULT_GROUP_FONT": 24,
"DEFAULT_GROUP_FONT_SIZE": undefined,
"DEFAULT_POSITION": [
Expand All @@ -33,7 +33,7 @@ LiteGraphGlobal {
"EVENT": -1,
"EVENT_LINK_COLOR": "#A86",
"GRID_SHAPE": 6,
"GROUP_FONT": "Arial",
"GROUP_FONT": "Inter",
"Globals": {},
"HIDDEN_LINK": -1,
"INPUT": 1,
Expand Down Expand Up @@ -65,7 +65,7 @@ LiteGraphGlobal {
"NODE_DEFAULT_COLOR": "#333",
"NODE_DEFAULT_SHAPE": 2,
"NODE_ERROR_COLOUR": "#E00",
"NODE_FONT": "Arial",
"NODE_FONT": "Inter",
"NODE_MIN_WIDTH": 50,
"NODE_MODES": [
"Always",
Expand Down